design-suite: fix correct url for both Design Suite and Design Team shorcuts

This commit is contained in:
luya 2015-03-09 02:39:43 -07:00
commit a7d928767c
10 changed files with 120 additions and 56 deletions

29
fedora-arm-server.ks Normal file
View File

@ -0,0 +1,29 @@
%include fedora-arm-base.ks
%packages
-@fedora-release-nonproduct
-@dial-up
# install the default groups for the server evironment since installing the environment is not working
@server-product
@standard
@headless-management
@container-management
@domain-client
-initial-setup-gui
-generic-release*
%end
%post
# setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
echo -n "Enabling initial-setup text mode on startup"
ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
echo .
%end

View File

@ -0,0 +1,31 @@
# PXE-to-Live Atomic: PXE boot directly into a running Atomic Host
# https://fedoraproject.org/wiki/Changes/AtomicHost
lang en_US.UTF-8
keyboard us
timezone America/New_York
zerombr
clearpart --all --initlabel
rootpw --lock --iscrypted locked
user --name=none
bootloader --timeout=1
network --bootproto=dhcp --device=link --activate
# We are only able to install atomic with separate /boot partition currently
part / --fstype="ext4" --size=6000
part /boot --size=500 --fstype="ext4"
shutdown
services --disabled=docker-storage-setup,network
services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
%post
# Ensure the root password is locked, we use cloud-init
passwd -l root
userdel -r none
# We copy content of separate /boot partition to root part when building live squashfs image,
# and we don't want systemd to try to mount it when pxe booting
cat /dev/null > /etc/fstab
%end

View File

@ -0,0 +1,28 @@
# Like the Atomic cloud image, but tuned for vagrant. Enable
# the vagrant user, disable cloud-init.
%include fedora-cloud-atomic.ks
services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
user --name=vagrant --password=vagrant
%post --erroronfail
# Work around cloud-init being both disabled and enabled; need
# to refactor to a common base.
systemctl mask cloud-init cloud-init-local cloud-config cloud-final
# Vagrant setup
sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
mkdir -m 0700 -p ~vagrant/.ssh
cat > ~vagrant/.ssh/authorized_keys << EOKEYS
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
EOKEYS
chmod 600 ~vagrant/.ssh/authorized_keys
chown -R vagrant:vagrant ~vagrant/.ssh/
%end

View File

@ -30,14 +30,14 @@ volgroup atomicos pv.01
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
# Equivalent of %include fedora-repo.ks
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
reboot
%post --erroronfail
# See https://github.com/projectatomic/rpm-ostree/issues/42
ostree remote delete fedora-atomic
ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'
# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299

View File

@ -21,7 +21,7 @@ bash
fedora-release
rootfiles
vim-minimal
yum
dnf
#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
-kernel

View File

@ -305,6 +305,9 @@ if [ -x /usr/bin/fc-cache ] ; then
fc-cache -f
fi
echo 'File created by kickstart. See systemd-update-done.service(8).' \
| tee /etc/.updated >/var/.updated
%end

View File

@ -113,6 +113,10 @@ cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
Name=About Design Suite
GenericName=About Design Suite Wiki Page
Comment=Wiki page of Design Suite
Name=About Design Team
GenericName=About Design Team
Comment=Wiki page of Design Team
>>>>>>> d4d001c54999e8f5401ca3f7b5d9b6a2d0132093
Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
Type=Application
Icon=applications-internet
@ -125,6 +129,8 @@ cat >> /usr/share/applications/fedora-design-team.desktop << FOE
[Desktop Entry]
Name=About Design Team
GenericName=About Design Team
Name=About Design Suite
GenericName=About Design Suite Wiki Page
Comment=Wiki page of Design Team
Exec=xdg-open http://fedoraproject.org/wiki/Design
Type=Application
@ -136,7 +142,5 @@ chmod a+x /usr/share/applications/fedora-design-team.desktop
# rebuild schema cache with any overrides we installed
glib-compile-schemas /usr/share/glib-2.0/schemas
#EOF
%end

View File

@ -42,12 +42,12 @@ chown liveuser:liveuser /home/liveuser/.xsession
# set up autologin for user liveuser
if [ -f /etc/sddm.conf ]; then
sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
sed -i 's/^#Session=.*/Session=kde-plasma.desktop/' /etc/sddm.conf
sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
else
cat > /etc/sddm.conf << SDDM_EOF
[Autologin]
User=liveuser
Session=kde-plasma.desktop
Session=plasma.desktop
SDDM_EOF
fi

View File

@ -12,17 +12,25 @@
caja-actions
mate-disk-usage-analyzer
mate-netspeed
mate-themes-extras
# more backgrounds
f22-backgrounds-mate
f21-backgrounds-extras-base
f21-backgrounds-extras-mate
# system tools
system-config-printer
system-config-printer-applet
# audio player
audacious
# First, no office
-planner
# office
@libreoffice
# dsl tools
rp-pppoe
# Drop things for size
-@3d-printing
@ -30,8 +38,6 @@ audacious
-bluez
-bluez-cups
-colord
-@dial-up
-espeak
-fedora-icon-theme
-GConf2
-gnome-bluetooth-libs
@ -39,69 +45,28 @@ audacious
-gnome-icon-theme-symbolic
-gnome-software
-gnome-themes
-gnome-themes-standard
-gnome-user-docs
-gstreamer1-plugins-good
-gstreamer1-plugins-bad-free
-gstreamer-plugins-good
-gstreamer-plugins-bad-free
-gstreamer-plugins-espeak
-@guest-desktop-agents
-@libreoffice
-@mate-applications
-mate-icon-theme-faenza
-NetworkManager-bluetooth
-samba-client
-ibus-chewing
-libical
-OpenEXR-libs
# Drop oversized fonts that aren't needed
-gnu-free-mono-fonts
-gnu-free-fonts-common
-gnu-free-serif-fonts
-gnu-free-sans-fonts
-stix-fonts
# Drop the Java plugin
-icedtea-web
-java-1.8.0-openjdk
# Drop things that pull in perl
-linux-atm
# Dictionaries are big
# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
# strong preference to giving it a go on #fedora-desktop.
# also see http://bugzilla.gnome.org/681084
-aspell-*
-man-pages*
-words
# Help and art can be big, too
-gnome-user-docs
-evolution-help
-desktop-backgrounds-basic
-*backgrounds-extras
# Legacy cmdline things we don't want
-krb5-auth-dialog
-krb5-workstation
-pam_krb5
-minicom
-jwhois
-mtr
-pinfo
-rsh
-ypbind
-yp-tools
-ntsysv
# Drop some system-config things
-system-config-rootpassword
-system-config-services
-policycoreutils-gui
-telnet
%end

View File

@ -171,6 +171,10 @@ hevea
#Include Mozilla Firefox
firefox
# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
-kde-l10n-*
-calligra-l10n-*
%end
%post