kde: added mediawriter as a replacement for liveusb-creator

This prevents systemd to update it during boot if DHCP supplies a
hostname, which causes sddm to not start. See
https://bugzilla.redhat.com/show_bug.cgi?id=1370222

README

@@ -1,23 +0,0 @@
-The master branch is where development takes place:
- - it may contain kickstart files that are broken, or
- - spin concepts that are in the process of being
-   approved by the Board (trademark approval), or
- - spin concepts that are in the process of being
-   approved by the Spins SIG
-
-The release specific branches contain spin concepts that:
- - are approved (both by Board and Spin SIG)
- - maintained for the remainder of the release cycle
-
-git clone ssh://git.fedorahosted.org/git/spin-kickstarts.git spin-kickstarts
-cd spin-kickstarts
-# If you need a specific branch other than master:
-git checkout BRANCHNAME
-# No tag has been added yet tag HEAD with
-git tag VERSION
-git push --tags
-make
-# Publish the released tar ball
-make publish
-# Clean up the generated files:
-make clean

README.md

@@ -0,0 +1,31 @@
+# fedora-kickstarts #
+
+This project is used to manage the Fedora kickstart files used in composing Fedora release images. 
+
+The master branch is used by rawhide and each release branch is used by that release. 
+
+All changes should be made via the PR workflow. 
+
+This project is packaged in Fedora as the spin-kickstarts package allowing users to see 
+and modify the kickstart files for their local needs. 
+
+## To make a release ##
+
+ * git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts
+ * cd fedora-kickstarts
+ * # If you need a specific branch other than master:
+ * git checkout BRANCHNAME
+ * # No tag has been added yet tag HEAD with
+ * git tag VERSION
+ * git push --tags
+ * make
+ * # Publish the released tar ball
+ * make publish
+ * # Clean up the generated files:
+ * make clean
+
+# bug reports #
+
+Bugs should be reported to the spin-kickstarts bugzilla component:
+
+https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=spin-kickstarts

fedora-aos.ks

@@ -9,7 +9,6 @@ selinux --permissive
 firewall --disabled
 bootloader --timeout=1 --append="acpi=force"
 network --bootproto=dhcp --device=eth0 --onboot=on
-services --enabled=network
 
 # Uncomment the next line
 # to make the root password be thincrust
@@ -95,5 +94,9 @@ generic-logos
 #
 %post
 
+# Enable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network on
+
 %end
 

fedora-arm-base.ks

@@ -7,14 +7,15 @@ firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux
 
-part /boot --size=512 --fstype ext4
-part swap --size=512 --fstype swap
-part / --size=3584 --fstype ext4
+part /boot/fw --size=30 --fstype vfat --asprimary
+part /boot --size=512 --fstype ext4 --asprimary
+part swap --size=512 --fstype swap --asprimary
+part / --size=3584 --fstype ext4 --asprimary
 
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 
-services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup --disabled=network
+services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
 
 %include fedora-repo.ks
 
@@ -25,11 +26,13 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
 @dial-up
 
 kernel
-
 dracut-config-generic
-
+# install tools needed to manage and boot arm systems
+@arm-tools
+rng-tools
 chrony
 extlinux-bootloader
+bcm283x-firmware
 initial-setup
 initial-setup-gui
 #lets resize / on first boot
@@ -38,15 +41,26 @@ initial-setup-gui
 # remove this in %post
 dracut-config-generic
 
-# install uboot images
-uboot-images-armv7
-
 # make sure all the locales are available for inital0-setup and anaconda to work
 glibc-all-langpacks
+
+# workaround for consequence of RHBZ #1324623: without this, with
+# yum-based creation tools, compose fails due to conflict between
+# libcrypt and libcrypt-nss. dnf does not seem to have the same
+# issue, so this may be dropped when appliance-creator is ported
+# to dnf.
+libcrypt-nss
+-libcrypt
 %end
 
 %post
 
+# Setup Raspberry Pi firmware
+cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
+sed -i '/vfat/ d' /etc/fstab
+
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
@@ -67,5 +81,13 @@ systemctl mask tmp.mount
 
 dnf -y remove dracut-config-generic
 
+# Disable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
+
 %end
 

fedora-arm-kde.ks

@@ -2,11 +2,8 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks
 
-part / --size=5000 --fstype ext4
+part / --size=5632 --fstype ext4
 
 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .
 
 %end

fedora-arm-lxde.ks

@@ -3,8 +3,5 @@
 %include fedora-lxde-packages.ks
 
 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .
 
 %end

fedora-arm-mate.ks

@@ -5,8 +5,5 @@
 part / --size=5500 --fstype ext4
 
 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .
 
 %end

fedora-arm-minimal.ks

@@ -1,6 +1,5 @@
 %include fedora-arm-base.ks
 
-part /boot --size=512 --fstype ext4
 part swap --size=256 --fstype swap
 part / --size=1279 --fstype ext4
 
@@ -11,6 +10,8 @@ part / --size=1279 --fstype ext4
 -generic-release*
 -glibc-all-langpacks
 glibc-langpack-en
+iw
+NetworkManager-wifi
 %end
 
 %post

fedora-arm-soas.ks

@@ -3,8 +3,5 @@
 %include fedora-soas-packages.ks
 
 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .
 
 %end

fedora-arm-workstation.ks

@@ -10,3 +10,8 @@ part / --size=5500 --fstype ext4
 
 %end
 
+%post
+# Most of the ARM X accelerated drivers need some level of CMA allocation
+sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
+
+%end

fedora-arm-xbase.ks

@@ -6,3 +6,11 @@
 @printing
 %end
 
+%post
+# Most of the ARM X accelerated drivers need some level of CMA allocation
+sed -i 's/\(append .*\)/\1 cma=192MB/' /boot/extlinux/extlinux.conf
+
+# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
+ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
+
+%end

fedora-arm-xfce.ks

@@ -5,8 +5,5 @@
 part / --size=4000 --fstype ext4
 
 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .
 
 %end

fedora-atomic-vagrant.ks

@@ -1,7 +1,7 @@
 # Like the Atomic cloud image, but tuned for vagrant.  Enable
 # the vagrant user, disable cloud-init.
 
-%include fedora-cloud-atomic.ks
+%include fedora-atomic.ks
 
 services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 

fedora-atomic.ks

@@ -18,11 +18,10 @@ user --name=none
 
 firewall --disabled
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --disabled=network
-services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -33,14 +32,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=https://kojipkgs.fedoraproject.org/compose/atomic/25/ --ref=fedora-atomic/25/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 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/25/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -122,8 +121,15 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
+# For trac ticket https://fedorahosted.org/cloud/ticket/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
+
 echo "Adding Developer Mode GRUB2 menu item."
 /usr/libexec/atomic-devmode/bootentry add
 
+# enable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
+
 %end
 

fedora-cinnamon-packages.ks

@@ -18,8 +18,12 @@ hexchat
 transmission
 parole
 
-# unlock default keyring. FIXME: Should probably be done in comps
-gnome-keyring-pam
+# make sure we have a graphical installer
+yumex-dnf
+
+# extra backgrounds
+desktop-backgrounds-basic
+f24-backgrounds-extras-gnome
 
 # save some space
 -fedora-icon-theme

fedora-cloud-atomic-pxetolive.ks

@@ -14,7 +14,7 @@ network --bootproto=dhcp --device=link --activate
 part / --fstype="ext4" --size=6000
 part /boot --size=500 --fstype="ext4"
 shutdown
-services --disabled=docker-storage-setup,network
+services --disabled=docker-storage-setup
 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
@@ -28,4 +28,9 @@ 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
+
+# Disable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
+
 %end

fedora-cloud-base-arm.ks

@@ -0,0 +1,12 @@
+%include fedora-cloud-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyAMA0,115200n8"
+
+part /boot --fstype="ext4" --size=500
+part /boot/efi --fstype="vfat" --size=100
+
+%packages
+efibootmgr
+grub2-efi
+shim
+%end

fedora-cloud-base-ppc.ks

@@ -0,0 +1,10 @@
+%include fedora-cloud-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+part prepboot --fstype="prepboot" --size=4
+part /boot --fstype="ext4" --size=500
+
+%packages
+grub2
+%end

fedora-cloud-base-vagrant.ks

@@ -19,7 +19,7 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux
 
 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between

fedora-cloud-base.ks

@@ -39,11 +39,17 @@ firewall --disabled
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4 --grow
+#
+# We need to disable 64bit options here or extlinux won't work.
+# See: http://www.syslinux.org/wiki/index.php/Filesystem#ext4
+# and
+# https://bugzilla.redhat.com/show_bug.cgi?id=1369934
+#
+part / --fstype ext4 --grow --mkfsoptions="-O ^64bit"
 
 %include fedora-repo.ks
 
@@ -61,6 +67,11 @@ reboot
 
 kernel-core
 @^cloud-server-environment
+# Need to pull in the udev subpackage
+systemd-udev
+
+# after move away from grub2 - let's add 'which' back
+which
 
 # rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
@@ -242,7 +253,6 @@ rm -f /var/lib/rpm/__db*
 # <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
 dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 
-
 # FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
@@ -260,5 +270,13 @@ echo "(Don't worry -- that out-of-space error was expected.)"
 # For trac ticket https://fedorahosted.org/cloud/ticket/128
 rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
 
+# Enable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network on
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
+
 %end
 

fedora-cloud-bigdata.ks

@@ -26,7 +26,7 @@ firewall --disabled
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
 
 network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -219,5 +219,9 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
+# Enable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network on
+
 %end
 

fedora-cloud-experimental.ks

@@ -17,7 +17,7 @@ firewall --disabled
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
 
 network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -211,5 +211,9 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
+# Enable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network on
+
 %end
 

fedora-docker-base-arm.ks

@@ -0,0 +1,6 @@
+%include fedora-docker-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+part /boot --fstype="ext4" --size=500
+part /boot/efi --fstype="vfat" --size=100

fedora-docker-base-ppc.ks

@@ -0,0 +1,5 @@
+%include fedora-docker-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+part prepboot --fstype="prepboot" --size=4

fedora-docker-base.ks

@@ -1,4 +1,4 @@
-# This is a minimal Fedora install designed to serve as a Docker base image. 
+# This is a minimal Fedora install designed to serve as a Docker base image.
 #
 # To keep this image minimal it only installs English language. You need to change
 # yum configuration in order to enable other languages.
@@ -9,9 +9,9 @@
 #
 # To do so, testing local changes, first you'll need a TDL file.  I store one here:
 # https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
-# 
+#
 # Then, once you have imagefactory and imagefactory-plugins installed, run:
-# 
+#
 #   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
 #
 
@@ -24,7 +24,7 @@ user --name=none
 keyboard us
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4
+part / --fstype ext4 --grow
 network --bootproto=dhcp --device=link --activate --onboot=on
 reboot
 
@@ -43,6 +43,9 @@ sssd-client
 %end
 
 %post --log=/tmp/anaconda-post.log
+
+set -e
+
 # Set the language rpm nodocs transaction flag persistently in the
 # image yum.conf and rpm macros
 
@@ -68,6 +71,7 @@ releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
+echo "# fstab intentionally empty for containers" > /etc/fstab
 rm -f /usr/lib/locale/locale-archive
 
 #Setup locale properly
@@ -76,13 +80,15 @@ localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
 rm -rf /var/cache/yum/*
 rm -f /tmp/ks-script*
 
-#Make it easier for systemd to run in Docker container
-cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
-sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
-
 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
 
+# Fix /run/lock breakage since it's not tmpfs in docker
+umount /run
+systemd-tmpfiles --create --boot
+
+# Remove machine-id on pre generated images
 rm -f /etc/machine-id
+touch /etc/machine-id
 
 %end

fedora-kde-packages.ks

@@ -1,4 +1,5 @@
 %packages
+@firefox
 @kde-apps
 @kde-desktop
 @kde-media
@@ -9,7 +10,7 @@
 ### The KDE-Desktop
 
 ### Browser
-firefox
+qupzilla
 
 ### fixes
 

fedora-live-astronomy_kde.ks

@@ -17,7 +17,7 @@
 %include fedora-live-kde.ks
 
 # The recommended part size for DVDs is too close to use for the astronomy spin
-part / --size 12288
+part / --size 14500
 
 %packages
 
@@ -44,43 +44,16 @@ indi-gphoto
 indi-sx
 indistarter
 kstars
-skychart
-skychart-data-dso
-skychart-data-stars
 stellarium
 
 # misc. astronomy
 celestia
-xvarstar
+virtualplanet
 
 # Some astro environment stuff
-astronomy-bookmarks
 astronomy-menus
 astronomy-menus-toplevel
 
-#python 2 tools/libraries not included from the groups
-python-tools
-python-ipython
-python-ipython-console
-python-ipython-notebook
-sympy
-python-networkx
-python-pandas
-# Python astronomy
-astropy-tools
-python-astropy
-python-astroML
-python-astroML-addons
-python2-astroquery
-python2-ccdproc
-python2-gatspy
-python-photutils
-python-sep
-pyephem
-APLpy
-ATpy
-
-
 #python 3 and tools/libraries not included from the groups
 python3
 python3-tools
@@ -93,22 +66,30 @@ python3-ipython-notebook
 python3-sympy
 python3-networkx
 python3-pandas
+python3-pillow
+python3-seaborn
+python3-statsmodels
+python3-scikit-learn
+python3-scikit-image
 # Python 3 astronomy
+astropy-tools
+ginga
 python3-astropy
 python3-astroML
 python3-astroML-addons
 python3-astroquery
+python3-astroscrappy
 python3-APLpy
 python3-ATpy
 python3-ccdproc
+python3-fitsio
 python3-gatspy
 python3-photutils
+python3-pyvo
+python3-reproject
 python3-sep
 
 # matplotlib backends
-python-matplotlib-qt4
-python-matplotlib-qt5
-python-matplotlib-tk
 python3-matplotlib-qt4
 python3-matplotlib-qt5
 python3-matplotlib-tk
@@ -116,8 +97,6 @@ python3-matplotlib-tk
 
 # Python IDE very useful for scientific use
 python3-spyder
-spyder
-
 
 #Version control- a GUI for each as well
 
@@ -125,18 +104,13 @@ spyder
 rapidsvn 
 git
 git-gui
-# Mercurial
-mercurial
-mercurial-hgk
 
 #Drawing, Picture viewing tools, Visualization tools
 dia
 gimp
-inkscape
-# Disabled temp. due to dependency issue with gsl 2.1
-#kst
-#kst-docs
-#kst-fits
+kst
+kst-docs
+kst-fits
 LabPlot
 
 #Misc. Utils
@@ -147,6 +121,7 @@ kate
 kate-plugins
 rlwrap
 screen
+plasma-applet-redshift-control
 
 # Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
 -kde-l10n-*

fedora-live-base.ks

@@ -17,7 +17,7 @@ xconfig --startxonboot
 zerombr
 clearpart --all
 part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=network,sshd
+services --enabled=NetworkManager,ModemManager --disabled=sshd
 network --bootproto=dhcp --device=link --activate
 shutdown
 
@@ -55,8 +55,6 @@ aajohan-comfortaa-fonts
 
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
-dracut-config-generic
--dracut-config-rescue
 grub2-efi
 syslinux
 
@@ -74,7 +72,7 @@ cat > /etc/rc.d/init.d/livesys << EOF
 # chkconfig: 345 00 99
 # description: Init script for live image.
 ### BEGIN INIT INFO
-# X-Start-Before: display-manager
+# X-Start-Before: display-manager chronyd
 ### END INIT INFO
 
 . /etc/init.d/functions
@@ -216,7 +214,9 @@ touch /.liveimg-configured
 
 # add static hostname to work around xauth bug
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
-echo "localhost" > /etc/hostname
+# the hostname must be something else than 'localhost'
+# https://bugzilla.redhat.com/show_bug.cgi?id=1370222
+echo "localhost-live" > /etc/hostname
 
 EOF
 
@@ -319,6 +319,18 @@ rm -f /var/lib/systemd/random-seed
 echo 'File created by kickstart. See systemd-update-done.service(8).' \
     | tee /etc/.updated >/var/.updated
 
+# Drop the rescue kernel and initramfs, we don't need them on the live media itself.
+# See bug 1317709
+rm -f /boot/*-rescue*
+
+# Disable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
+
 %end
 
 
@@ -330,4 +342,5 @@ if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
   if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
   cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
 fi
+
 %end

fedora-live-design_suite.ks

@@ -10,22 +10,54 @@
 %include fedora-live-workstation.ks
 
 # Size partition
-part / --size 10240
+part / --size 14336
 
 %packages
 # Switch to groups for design suite
 @design-suite
 
+# Added addons to address rhbz#1336879 from dnf
+gimp-data-extras
+gimp-dbp
+gimp-dds-plugin
+gimp-elsamuko
+gimp-fourier-plugin
+gimp-gap
+gimp-help
+gimp-help-browser
+gimp-high-pass-filter
+gimp-layer-via-copy-cut
+gimp-lensfun
+gimp-lqr-plugin
+gimp-normalmap
+gimp-paint-studio
+gimp-resynthesizer
+gimp-save-for-web
+gimp-separate+
+gimp-wavelet-denoise-plugin
+gimpfx-foundry
+gmic-gimp
+inkscape-psd
+inkscape-sozi
+LuxRender-blender
+sane-backends-drivers-scanners
+xsane-gimp
+#YafaRay-blender
+
 # Preview Gnome Photos
 gnome-photos
 
+# Add gthumb for renaming group files
+gthumb
+
 # Extra wallpapers
 f23-backgrounds-extras-base
 f23-backgrounds-extras-gnome
+f24-backgrounds-extras-base
+f24-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes
--gthumb
 -eog
 -rdesktop
 
@@ -35,7 +67,7 @@ f23-backgrounds-extras-gnome
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'gnome-photos.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+favorite-apps=['firefox.desktop', 'shotwell.desktop', 'darktable.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
 FOE
 
 # Add link to lists of tutorials

fedora-live-games.ks

@@ -51,8 +51,8 @@ gl-117
 glob2
 lincity-ng
 tmw
-maniadrive
-maniadrive-music
+#maniadrive - maniadrive isn't building with php7
+#maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
@@ -60,7 +60,7 @@ netpanzer
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
-supertux
+# supertux # Crashing
 #supertuxkart #remove for size
 ultimatestunts
 warzone2100
@@ -98,7 +98,7 @@ openlierox
 pachi
 pioneers
 quarry
-Ri-li
+# Ri-li cut for size
 rogue
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures

fedora-live-jam_kde.ks

@@ -108,7 +108,6 @@ ladspa-vco-plugins
 #lv2 plugins
 lv2
 lv2-avw-plugins
-lv2-fil-plugins
 lv2-invada-plugins
 lv2-kn0ck0ut
 lv2-ll-plugins

fedora-live-kde.ks

@@ -30,7 +30,7 @@ part / --size=6144
 k3b				# ~15 megs
 #kdeartwork			# only include some parts of kdeartwork
 fuse
-liveusb-creator
+mediawriter
 
 # only include kdegames-minimal
 -kdegames

fedora-live-scientific_kde.ks

@@ -133,9 +133,9 @@ backintime-kde
 libotf
 
 #root
-root
-root-gui-fitpanel
-root-python
+#root
+#root-gui-fitpanel
+#root-python
 
 #Multiple jobs/clustering system
 # torque

fedora-live-workstation.ks

@@ -4,7 +4,11 @@
 
 %include fedora-live-base.ks
 %include fedora-workstation-packages.ks
-%include snippets/packagekit-cached-metadata.ks
+#
+# Disable this for now to see if packagekit is causing
+# compose failures by leaving a gpg-agent around holding /dev/null open.
+#
+#include snippets/packagekit-cached-metadata.ks
 
 part / --size 6656
 

fedora-live-xfce.ks

@@ -30,7 +30,7 @@ mkdir -p /home/liveuser/.config/xfce4
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
 FileManager=Thunar
-WebBrowser=midori
+WebBrowser=firefox
 FOE
 
 # disable screensaver locking (#674410)

fedora-mate-packages.ks

@@ -7,27 +7,25 @@ compiz-plugins-main
 compiz-plugins-extra
 compiz-manager
 compizconfig-python
-compiz-plugins-unsupported
-compiz-mate
+compiz-plugins-experimental
 libcompizconfig
 compiz-plugins-main
 ccsm
+simple-ccsm
 emerald-themes
 emerald
 fusion-icon
-fusion-icon-gtk
 @networkmanager-submodules
 blueman
 
 # some apps from mate-applications
 caja-actions
 mate-disk-usage-analyzer
-mate-netspeed
 
 # more backgrounds
-f23-backgrounds-base
-f23-backgrounds-mate
-f23-backgrounds-extras-base
+f25-backgrounds-base
+f25-backgrounds-mate
+f24-backgrounds-extras-base
 
 # system tools
 system-config-printer
@@ -48,6 +46,10 @@ PackageKit-gstreamer-plugin
 # dsl tools
 rp-pppoe
 
+# some tools
+p7zip
+p7zip-plugins
+
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns

fedora-repo-not-rawhide.ks

@@ -1,3 +1,4 @@
 repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 #repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch

fedora-repo-rawhide.ks

@@ -1 +1,2 @@
 repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch

fedora-repo.ks

@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented
 
 # For the master branch the following should be uncommented
-%include fedora-repo-rawhide.ks
+# %include fedora-repo-rawhide.ks
 
 # For non-master branches the following should be uncommented
-# %include fedora-repo-not-rawhide.ks
+%include fedora-repo-not-rawhide.ks

fedora-soas-packages.ks

@@ -32,6 +32,7 @@
 -abrt-cli
 -ibus*
 -hyperv-daemons
+-webkitgtk4-plugin-process-gtk2
 
 # Add some extra fonts
 dejavu-sans-fonts
@@ -76,9 +77,6 @@ pulseaudio-utils
 # Usefulness for DSL connections as per:
 # http://bugs.sugarlabs.org/ticket/1951
 rp-pppoe
-# Useful for SoaS duplication from:
-# http://bugs.sugarlabs.org/ticket/74
-livecd-tools
 
 # Get the Sugar boot screen
 -plymouth-system-theme

fedora-workstation-packages.ks

@@ -11,6 +11,7 @@
 @core
 @firefox
 @fonts
+@gnome-desktop
 @guest-desktop-agents
 @hardware-support
 @libreoffice

fedora-xfce-packages.ks

@@ -21,6 +21,8 @@
 
 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
+# Admin tools are handy to have
+@admin-tools
 # Add some screensavers, people seem to like them
 # Note that blank is still default.
 xscreensaver-extras

snippets/packagekit-cached-metadata.ks

@@ -3,7 +3,7 @@
 %post --nochroot
 # Copy over files needed for networking inside the chroot
 for f in /etc/resolv.conf /etc/hosts ; do
-  test -f $f && cp -a $f ${INSTALL_ROOT}${f}.kickstart
+  test -f $f && cp $f /mnt/sysimage/$f.kickstart
 done
 %end
 
@@ -19,7 +19,7 @@ PK_PREFIX=`mktemp -d`
 mkdir -p $PK_PREFIX/etc/yum.repos.d
 if [ -f /etc/yum.repos.d/fedora.repo ] ; then
   cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/branched/$basearch/os/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \
          $PK_PREFIX/etc/yum.repos.d/fedora.repo
 fi
 if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then
@@ -34,7 +34,7 @@ if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then
 fi
 if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then
   cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/$basearch/os/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \
          $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo
 fi
 rpm --root=$PK_PREFIX --initdb