Merge remote-tracking branch 'upstream/f26' into f26

Should fix blocker bug https://bugzilla.redhat.com/show_bug.cgi?id=1436873 (Previous code here did not work.)

README

@@ -1,30 +0,0 @@
-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. 
-
-Changes should be made to rawhide first, then 
-cherry-picked back to any release branches that require 
-it. 
-
-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/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=2800 --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
 
@@ -22,31 +23,48 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
 @core
 @standard
 @hardware-support
-@dial-up
 
 kernel
-fedora-arm-installer
+# remove this in %post
 dracut-config-generic
-
+-dracut-config-rescue
+# install tools needed to manage and boot arm systems
+@arm-tools
+-uboot-images-armv8
+rng-tools
 chrony
 extlinux-bootloader
+bcm283x-firmware
 initial-setup
 initial-setup-gui
+-iwl*
+-ipw*
+-trousers-lib
+-usb_modeswitch
+-iproute-tc
 #lets resize / on first boot
 # dracut-modules-growroot
 
-# 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 +85,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

@@ -1,12 +1,9 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-kde-packages.ks
+%include fedora-kde-common.ks
 
-part / --size=5632 --fstype ext4
+part / --size=5690 --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

@@ -1,10 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-lxde-packages.ks
+%include fedora-lxde-common.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-lxqt.ks

@@ -0,0 +1,14 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-lxqt-common.ks
+
+part / --size=3800 --fstype ext4 --asprimary
+
+%packages
+# trojita not available on non-x86 platforms
+-trojita
+%end
+
+%post
+
+%end

fedora-arm-mate.ks

@@ -1,12 +1,9 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-mate-packages.ks
+%include fedora-mate-common.ks
 
 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,27 +1,10 @@
 %include fedora-arm-base.ks
+%include fedora-minimal-common.ks
 
 part /boot --size=512 --fstype ext4
 part swap --size=256 --fstype swap
-part / --size=1279 --fstype ext4
+part / --size=1250 --fstype ext4
 
 %packages
--@standard
--@dial-up
--initial-setup-gui
--generic-release*
--glibc-all-langpacks
-glibc-langpack-en
-iw
-NetworkManager-wifi
+-xkeyboard-config
 %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 .
-
-%end
-

fedora-arm-python-classroom.ks

@@ -0,0 +1,8 @@
+# Maintained by the Fedora Python SIG:
+# http://fedoraproject.org/wiki/SIGs/Python
+# mailto:python-devel@lists.fedoraproject.org
+
+# The ARM Workstion based Python Classroom Lab
+
+%include fedora-arm-workstation.ks
+%include fedora-python-classroom-gnome-common.ks

fedora-arm-server.ks

@@ -1,10 +1,9 @@
 %include fedora-arm-base.ks
 
 # server defaults to xfs for / so lets do so on arm also
-part / --size=3000 --fstype xfs
+part / --size=2500 --fstype xfs
 
 %packages
--@dial-up
 # install the default groups for the server evironment since installing the environment is not working
 @server-product
 @standard

fedora-arm-soas.ks

@@ -1,10 +1,9 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-soas-packages.ks
+%include fedora-soas-common.ks
+
+part / --size=3300 --fstype ext4 --asprimary
 
 %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

@@ -1,6 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-workstation-packages.ks
+%include fedora-workstation-common.ks
 
 part / --size=5500 --fstype ext4
 
@@ -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

@@ -1,12 +1,9 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-xfce-packages.ks
+%include fedora-xfce-common.ks
 
 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,10 +1,8 @@
-# Like the Atomic cloud image, but tuned for vagrant.  Enable
-# the vagrant user, disable cloud-init.
+# Like the Atomic Host cloud image, but tuned for vagrant: enable the
+# vagrant user, disable cloud-init.
 
 %include fedora-atomic.ks
 
-services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
-
 user --name=vagrant --password=vagrant
 rootpw vagrant
 
@@ -14,16 +12,19 @@ rootpw vagrant
 # platforms (virtualbox and kvm)
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
 
-
 %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
 
+# The inherited cloud %post locks the passwd, but we want it
+# unlocked for vagrant, just like downstream.
+passwd -u root
+
 # Vagrant setup
 sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+echo 'vagrant ALL=(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

fedora-atomic.ks

@@ -6,7 +6,7 @@
 # dedicated for Docker containers, and uses docker-storage-setup to
 # dynamically resize storage on boot.
 
-text
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
@@ -14,15 +14,13 @@ timezone --utc Etc/UTC
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
-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,24 +31,28 @@ 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=https://kojipkgs.fedoraproject.org/compose/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/26/ --ref=fedora/26/x86_64/atomic-host
 
 reboot
 
 %post --erroronfail
 # See https://github.com/projectatomic/rpm-ostree/issues/42
+# we only need this for before f26 release where we are using a
+# temporary "dev" repo url above. We want to change the remote
+# we use to match where the repo will live for the entirety of f26.
 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=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-26-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/26/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
-# remove the user anaconda forces us to make
-userdel -r none
+
+# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
+cp /etc/skel/.bash* /var/roothome
 
 # Configure docker-storage-setup to resize the partition table on boot
 # https://github.com/projectatomic/docker-storage-setup/pull/25
-echo 'GROWPART=true' > /etc/sysconfig/docker-storage-setup
+echo 'GROWPART=true' >> /etc/sysconfig/docker-storage-setup
 
 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -107,7 +109,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 #EOF
 
 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
+rm -f /var/lib/systemd/random-seed
 
 echo "Packages within this cloud image:"
 echo "-----------------------------------------------------------------------"
@@ -122,8 +124,20 @@ 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://pagure.io/atomic-wg/issue/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
+
 echo "Adding Developer Mode GRUB2 menu item."
 /usr/libexec/atomic-devmode/bootentry add
 
-%end
+# Disable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
 
+# Anaconda is writing an /etc/resolv.conf from the install environment.
+# The system should start out with an empty file, otherwise cloud-init
+# will try to use this information and may error:
+# https://bugs.launchpad.net/cloud-init/+bug/1670052
+truncate -s 0 /etc/resolv.conf
+
+%end

fedora-cinnamon-common.ks

@@ -1,4 +1,4 @@
-# fedora-cinnamon-packages.ks
+# fedora-cinnamon-common.ks
 #
 # Description:
 # - Fedora package set for the Cinnamon Desktop Environment
@@ -16,16 +16,12 @@
 pidgin
 hexchat
 transmission
-parole
 
-# make sure we have a graphical installer
-yumex-dnf
+# mp3 support
+gstreamer1-plugins-ugly-free
 
 # extra backgrounds
-f24-backgrounds-extras-base
-
-# save some space
--fedora-icon-theme
--PackageKit*                # we switched to yumex, so we don't need this
+desktop-backgrounds-basic
+f26-backgrounds-extras-gnome
 
 %end

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

@@ -1,12 +0,0 @@
-%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

@@ -1,10 +0,0 @@
-%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" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
 
 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between
@@ -32,9 +32,6 @@ dnf-yum
 # users setup. This can actually take a bit of time.  Just fold it
 # in to the base box disk image
 rsync
-# Add fuse-sshfs so that the vagrant-sshfs plugin won't have to
-# install it on boot. https://github.com/dustymabe/vagrant-sshfs
-fuse-sshfs
 %end
 
 %post --erroronfail
@@ -45,7 +42,7 @@ 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
+echo 'vagrant ALL=(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

fedora-cloud-base.ks

@@ -1,10 +1,10 @@
-# This is a basic Fedora 21 spin designed to work in OpenStack and other
+# This is a basic Fedora cloud spin designed to work in OpenStack and other
 # private cloud environments. It's configured with cloud-init so it will
 # take advantage of ec2-compatible metadata services for provisioning ssh
 # keys. Cloud-init creates a user account named "fedora" with passwordless
 # sudo access. The root password is empty and locked by default.
 #
-# Note that unlike the standard F20 install, this image has /tmp on disk
+# Note that unlike the standard Fedora install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 #
 # This kickstart file is designed to be used with ImageFactory (in Koji).
@@ -24,7 +24,7 @@
 #   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
 #
 
-cmdline
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
@@ -32,18 +32,17 @@ timezone --utc Etc/UTC
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
-user --name=none
 
 firewall --disabled
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 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 / --fstype ext4 --grow
+autopart --noboot --nohome --noswap --nolvm
 
 %include fedora-repo.ks
 
@@ -64,6 +63,9 @@ kernel-core
 # 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
 
@@ -79,7 +81,9 @@ systemd-udev
 #-kbd
 -uboot-tools
 -kernel
--grub2
+# No need for plymouth. Also means anaconda won't put rhgb/quiet
+# on kernel command line
+-plymouth
 
 %end
 
@@ -113,12 +117,6 @@ ln -sf /boot/grub/grub.conf /etc/grub.conf
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
-# remove the user anaconda forces us to make
-userdel -r none
-
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
 
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
@@ -154,9 +152,6 @@ localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archiv
 mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
 build-locale-archive
 echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
-awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
 
 
 echo -n "Getty fixes"
@@ -216,7 +211,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 #EOF
 
 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
+rm -f /var/lib/systemd/random-seed
 
 echo "Cleaning old dnf repodata."
 # FIXME: clear history?
@@ -236,22 +231,13 @@ echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
 
-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <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
 touch /var/log/boot.log
-chattr -i /boot/extlinux/ldlinux.sys
-/usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
+# ignore return code because UEFI systems with vfat filesystems
+# that don't support selinux will give us errors
+/usr/sbin/fixfiles -R -a restore || true
 
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
@@ -262,5 +248,19 @@ 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
+
+# Anaconda is writing an /etc/resolv.conf from the install environment.
+# The system should start out with an empty file, otherwise cloud-init
+# will try to use this information and may error:
+# https://bugs.launchpad.net/cloud-init/+bug/1670052
+truncate -s 0 /etc/resolv.conf
+
 %end
 

fedora-cloud-bigdata.ks

@@ -23,10 +23,10 @@ user --name=none
 
 firewall --disabled
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 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
@@ -97,10 +97,6 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none
 
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
-
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
@@ -178,7 +174,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 #EOF
 
 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
+rm -f /var/lib/systemd/random-seed
 
 echo "Cleaning old yum repodata."
 yum history new
@@ -209,9 +205,7 @@ echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
 mkdir -p /var/cache/yum
-chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
 
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
@@ -219,5 +213,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

@@ -14,10 +14,10 @@ user --name=none
 
 firewall --disabled
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 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
@@ -88,10 +88,6 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none
 
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
-
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
@@ -169,7 +165,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 #EOF
 
 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
+rm -f /var/lib/systemd/random-seed
 
 echo "Cleaning old yum repodata."
 yum history new
@@ -211,5 +207,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-disk-base.ks

@@ -0,0 +1,94 @@
+# fedora-disk-base.ks
+#
+# Defines the basics for all kickstarts in the fedora-live branch
+# Does not include package selection (other then mandatory)
+# Does not include localization packages or configuration
+#
+# Does includes "default" language configuration (kickstarts including
+# this template can override these settings)
+
+text
+lang en_US.UTF-8
+keyboard us
+timezone US/Eastern
+auth --useshadow --passalgo=sha512
+selinux --enforcing
+firewall --enabled --service=mdns
+services --enabled=sshd,NetworkManager,chronyd
+network --bootproto=dhcp --device=link --activate
+rootpw --lock --iscrypted locked
+shutdown
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+zerombr
+clearpart --all --initlabel --disklabel=msdos
+
+# make sure that initial-setup runs and lets us do all the configuration bits
+firstboot --reconfig
+
+%include fedora-repo.ks
+
+%packages
+@core
+@standard
+@hardware-support
+
+kernel
+# remove this in %post
+dracut-config-generic
+-dracut-config-rescue
+# install tools needed to manage and boot arm systems
+@arm-tools
+-uboot-images-armv7
+rng-tools
+chrony
+bcm283x-firmware
+initial-setup
+-iwl*
+-ipw*
+-trousers-lib
+-usb_modeswitch
+-iproute-tc
+-generic-release*
+
+# 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/efi/
+mv -f /boot/efi/config-64.txt /boot/efi/config.txt
+cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+echo "Packages within this disk image"
+rpm -qa
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
+# remove random seed, the newly installed instance should make it's own
+rm -f /var/lib/systemd/random-seed
+
+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-disk-minimal.ks

@@ -0,0 +1,10 @@
+%include fedora-disk-base.ks
+%include fedora-minimal-common.ks
+
+services --enabled=sshd,NetworkManager,chronyd,initial-setup
+
+autopart --type=plain
+
+%packages
+-xkeyboard-config
+%end

fedora-disk-server.ks

@@ -0,0 +1,27 @@
+%include fedora-disk-base.ks
+
+services --enabled=sshd,NetworkManager,chronyd,initial-setup
+
+autopart
+
+%packages
+# 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 .
+
+%end
+

fedora-disk-workstation.ks

@@ -0,0 +1,19 @@
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-workstation-common.ks
+
+bootloader --append="cma=256MB"
+
+services --enabled=sshd,NetworkManager,chronyd
+
+autopart --type=plain
+
+%packages
+-initial-setup
+-initial-setup-gui
+
+%end
+
+%post
+
+%end

fedora-disk-xbase.ks

@@ -0,0 +1,21 @@
+%packages
+@base-x
+@fonts
+@input-methods
+@multimedia
+@printing
+-@guest-desktop-agents
+
+# Need aajohan-comfortaa-fonts for the SVG rnotes images
+aajohan-comfortaa-fonts
+
+# anaconda needs the locales available to run for different locales
+glibc-all-langpacks
+
+%end
+
+%post
+# 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-docker-base-arm.ks

@@ -1,6 +0,0 @@
-%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-minimal.ks

@@ -0,0 +1,70 @@
+# See docker-base-common.ks for details on how to hack on docker image kickstarts
+# This base is a stripped back Fedora image without python3/dnf.
+# If you need that use the standard base image.
+
+%include fedora-docker-common.ks
+
+%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+microdnf
+
+%end
+
+%post --erroronfail --log=/root/anaconda-post.log
+# remove some random help txt files
+rm -fv usr/share/gnupg/help*.txt
+
+# Pruning random things
+rm usr/lib/rpm/rpm.daily
+rm -rfv usr/lib64/nss/unsupported-tools/  # unsupported
+
+# Statically linked crap
+rm -fv usr/sbin/{glibc_post_upgrade.x86_64,sln}
+ln usr/bin/ln usr/sbin/sln
+
+# Remove some dnf info
+rm -rfv /var/lib/dnf
+
+# don't need icons
+rm -rfv /usr/share/icons/*
+
+#some random not-that-useful binaries
+rm -fv /usr/bin/pinky
+
+# we lose presets by removing /usr/lib/systemd but we do not care
+rm -rfv /usr/lib/systemd
+
+# if you want to change the timezone, bind-mount it from the host or reinstall tzdata
+rm -fv /etc/localtime
+mv /usr/share/zoneinfo/UTC /etc/localtime
+rm -rfv  /usr/share/zoneinfo
+
+# Final pruning
+rm -rfv /var/cache/* /var/log/* /tmp/*
+
+%end
+
+%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
+set -eux
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
+# Fix /run/lock breakage since it's not tmpfs in docker
+# This unmounts /run (tmpfs) and then recreates the files
+# in the /run directory on the root filesystem of the container
+# NOTE: run this in nochroot because "umount" does not exist in chroot
+umount /mnt/sysimage/run
+# The file that specifies the /run/lock tmpfile is
+# /usr/lib/tmpfiles.d/legacy.conf, which is part of the systemd
+# rpm that isn't included in this image. We'll create the /run/lock
+# file here manually with the settings from legacy.conf
+# NOTE: chroot to run "install" because it is not in anaconda env
+chroot /mnt/sysimage install -d /run/lock -m 0755 -o root -g root
+
+
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
+# NOTE: run this in nochroot because "find" does not exist in chroot
+KEEPLANG=en_US
+for dir in locale i18n; do
+    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
+done
+
+%end

fedora-docker-base-ppc.ks

@@ -1,5 +0,0 @@
-%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,88 +1,39 @@
-# 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.
-#
-###  Hacking on this image ###
-# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
-# but you can run imagefactory locally too.
-#
-# 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
-#
+# See docker-base-common.ks for details on how to hack on docker image kickstarts
+# This base is a standard Fedora image with python3 and dnf
 
-cmdline
-bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-user --name=none
-
-keyboard us
-zerombr
-clearpart --all
-part / --fstype ext4 --grow
-network --bootproto=dhcp --device=link --activate --onboot=on
-reboot
+%include fedora-docker-common.ks
 
 %packages --excludedocs --instLangs=en --nocore
-bash
-fedora-release
 rootfiles
+tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sssd-client
-#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
--kernel
-
 
 %end
 
-%post --log=/tmp/anaconda-post.log
-# Set the language rpm nodocs transaction flag persistently in the
-# image yum.conf and rpm macros
+%post --erroronfail --log=/root/anaconda-post.log
 
-# remove the user anaconda forces us to make
-userdel -r none
-
-LANG="en_US"
-echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
-
-# Carry these configs for both dnf and yum for users who are calling
-# yum-deprecated directly. This will keep the experience between both
-# consistent
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
-
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
-
-echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-rm -f /usr/lib/locale/locale-archive
-
-#Setup locale properly
-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
+# remove some extraneous files
+rm -rf /var/cache/dnf/*
+rm -rf /tmp/*
 
 #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
 
-rm -f /etc/machine-id
+# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
+# Fix /run/lock breakage since it's not tmpfs in docker
+# This unmounts /run (tmpfs) and then recreates the files
+# in the /run directory on the root filesystem of the container
+#
+# We ignore the return code of the systemd-tmpfiles command because
+# at this point we have already removed the /etc/machine-id and all
+# tmpfiles lines with %m in them will fail and cause a bad return
+# code. Example failure:
+#   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
+#
+umount /run
+systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
 
 %end

fedora-docker-common.ks

@@ -0,0 +1,68 @@
+# This is the common bits between Fedora Docker base image.
+#
+# To keep this image minimal it only installs English language. You need to change
+# dnf configuration in order to enable other languages.
+#
+# ##  Hacking on this image ###
+# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
+# but you can run imagefactory locally too.
+#
+# 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:
+#
+#   ksflatten -c fedora-docker-base[-minimal].ks -o fedora-docker-base-test.ks
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base-test.ks docker
+#
+
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+bootloader --disabled
+timezone --isUtc --nontp Etc/UTC
+rootpw --lock --iscrypted locked
+keyboard us
+network --bootproto=dhcp --device=link --activate --onboot=on
+reboot
+
+# boot partitions are irrelevant as the final docker image is a tarball
+zerombr
+clearpart --all
+autopart --noboot --nohome --noswap --nolvm
+
+%packages --excludedocs --instLangs=en --nocore
+fedora-release
+bash
+-kernel
+-dosfstools
+-e2fsprogs
+-fuse-libs
+-gnupg2-smime
+-libss # used by e2fsprogs
+-libusbx
+-pinentry
+-shared-mime-info
+-trousers
+-xkeyboard-config
+
+%end
+
+%post --erroronfail --log=/root/anaconda-post.log
+set -eux
+
+# Set install langs macro so that new rpms that get installed will
+# only install langs that we limit it to.
+LANG="en_US"
+echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
+echo "Import RPM GPG key"
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+
+echo "# fstab intentionally empty for containers" > /etc/fstab
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
+
+%end

fedora-kde-common.ks

@@ -0,0 +1,79 @@
+%packages
+@firefox
+@kde-apps
+@kde-desktop
+@kde-media
+@kde-office
+@kde-telepathy
+@networkmanager-submodules
+
+### The KDE-Desktop
+
+### Browser
+qupzilla
+
+### fixes
+
+# use kde-print-manager instead of system-config-printer
+-system-config-printer
+# make sure mariadb lands instead of MySQL (hopefully a temporary hack)
+mariadb-embedded
+mariadb-libs
+mariadb-server
+
+# minimal localization support - allows installing the kde-l10n-* packages
+system-config-language
+kde-l10n
+
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
+-desktop-backgrounds-basic
+-kdeaccessibility*
+#-ktorrent			# kget has also basic torrent features (~3 megs)
+-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
+#-amarok 			# ~23 megs (mysql-embedded etc.)
+-kipi-plugins			# ~8 megs + drags in Marble
+#-kdeplasma-addons		# ~16 megs
+#-krusader			# ~4 megs
+
+# Additional packages that are not default in kde-* groups, but useful
+k3b				# ~15 megs
+#kdeartwork			# only include some parts of kdeartwork
+fuse
+mediawriter
+
+# only include kdegames-minimal
+-kdegames
+kdegames-minimal
+
+### space issues
+
+# fonts (we make no bones about admitting we're english-only)
+wqy-microhei-fonts			# a compact CJK font, to replace:
+-naver-nanum-gothic-fonts		# Korean
+-vlgothic-fonts				# Japanese
+-adobe-source-han-sans-cn-fonts		# simplified Chinese
+-adobe-source-han-sans-tw-fonts 	# traditional Chinese
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
+#-stix-fonts		# mathematical symbols
+
+# remove input methods to free space
+-@input-methods
+-scim*
+-m17n*
+-ibus*
+-iok
+
+# admin-tools
+-gnome-disk-utility
+# kcm_clock still lacks some features, so keep system-config-date around
+#-system-config-date
+# prefer kcm_systemd
+-system-config-services
+# prefer/use kusers
+-system-config-users
+
+## avoid serious bugs by omitting broken stuff
+
+%end

fedora-kde-packages.ks

@@ -1,29 +0,0 @@
-%packages
-@firefox
-@kde-apps
-@kde-desktop
-@kde-media
-@kde-office
-@kde-telepathy
-@networkmanager-submodules
-
-### The KDE-Desktop
-
-### Browser
-qupzilla
-
-### fixes
-
-# use kde-print-manager instead of system-config-printer
--system-config-printer
-# make sure mariadb lands instead of MySQL (hopefully a temporary hack)
-mariadb-embedded
-mariadb-libs
-mariadb-server
-
-# minimal localization support - allows installing the kde-l10n-* packages
-system-config-language
-kde-l10n
-
-%end
-

fedora-live-astronomy_kde.ks

@@ -35,6 +35,7 @@ sextractor
 siril
 skyviewer
 swarp
+wcstools
 
 # Observatory: KStars + INDI drivers + Skychart
 indi-aagcloudwatcher
@@ -51,7 +52,6 @@ celestia
 virtualplanet
 
 # Some astro environment stuff
-astronomy-bookmarks
 astronomy-menus
 astronomy-menus-toplevel
 
@@ -67,17 +67,29 @@ 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
+python3-wcsaxes
 
 # matplotlib backends
 python3-matplotlib-qt4
@@ -111,6 +123,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,8 +17,9 @@ 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
+rootpw --lock --iscrypted locked
 shutdown
 
 %include fedora-repo.ks
@@ -72,7 +73,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
@@ -214,7 +215,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
 
@@ -321,6 +324,14 @@ echo 'File created by kickstart. See systemd-update-done.service(8).' \
 # 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
 
 
@@ -332,4 +343,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-cinnamon.ks

@@ -8,7 +8,7 @@
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-cinnamon-packages.ks
+%include fedora-cinnamon-common.ks
 
 part / --size=6144
 

fedora-live-design_suite.ks

@@ -1,11 +1,11 @@
 # fedora-design-suite.ks
 # Based on Live Workstation
 # Description:
-# - A Spin targeted towards professional designers
+# - A collection of applications targeted towards professional visual designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
-# Maintainers:
+# Maintainer:
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
-# - Previous maintainer Sebastian Dziallas
+# - Credit to Sebastian Dziallas for initiating the project
 
 %include fedora-live-workstation.ks
 
@@ -24,7 +24,6 @@ gimp-elsamuko
 gimp-fourier-plugin
 gimp-gap
 gimp-help
-gimp-help-browser
 gimp-high-pass-filter
 gimp-layer-via-copy-cut
 gimp-lensfun
@@ -39,22 +38,20 @@ gimpfx-foundry
 gmic-gimp
 inkscape-psd
 inkscape-sozi
-LuxRender-blender
+inkscape-table
 sane-backends-drivers-scanners
 xsane-gimp
 #YafaRay-blender
 
-# Preview Gnome Photos
+# Add extra gnome applications
+gnome-books
+gnome-calendar
 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
+f26-backgrounds-extras-base
+f26-backgrounds-extras-gnome
+
 
 # removal of unneeded applications
 -gnome-boxes
@@ -67,7 +64,7 @@ f24-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', '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']
+favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita', '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

@@ -45,14 +45,14 @@ extremetuxracer
 freeciv
 freecol
 freedoom
-# freedroidrpg cut for size
+freedroidrpg
 frozen-bubble
 gl-117
 glob2
 lincity-ng
 tmw
-maniadrive
-maniadrive-music
+#maniadrive - currently broken
+#maniadrive-music - has been retired
 megaglest
 nethack-vultures
 netpanzer
@@ -60,13 +60,13 @@ netpanzer
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
-supertux
+# supertux # Crashing
 #supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
 # worminator # Would pull in fluid-soundfont-lite-patches
-# warmux - Cut for size
+warmux
 xmoto
 
 # traditional (small)

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-base.ks

@@ -3,7 +3,7 @@
 # mailto:kde@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-kde-packages.ks
+%include fedora-kde-common.ks
 
 %post
 
@@ -55,11 +55,9 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF
 
-# Disable plasma-pk-updates
-sed -i \
-    -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \
-    /usr/share/plasma/plasmoids/org.kde.plasma.pkupdates/metadata.desktop \
-    /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop
+# Disable plasma-pk-updates (bz #1436873 and 1206760)
+echo "Removing plasma-pk-updates package."
+rpm -e plasma-pk-updates
 
 # Disable baloo
 cat > /home/liveuser/.config/baloofilerc << BALOO_EOF

fedora-live-kde.ks

@@ -13,63 +13,5 @@
 # DVD payload
 part / --size=6144
 
-
-%packages
-# unwanted packages from @kde-desktop
-# don't include these for now to fit on a cd
--desktop-backgrounds-basic
--kdeaccessibility*
-#-ktorrent			# kget has also basic torrent features (~3 megs)
--digikam			# digikam has duplicate functionality with gwenview (~28 megs)
-#-amarok 			# ~23 megs (mysql-embedded etc.)
--kipi-plugins			# ~8 megs + drags in Marble
-#-kdeplasma-addons		# ~16 megs
-#-krusader			# ~4 megs
-
-# Additional packages that are not default in kde-* groups, but useful
-k3b				# ~15 megs
-#kdeartwork			# only include some parts of kdeartwork
-fuse
-liveusb-creator
-
-# only include kdegames-minimal
--kdegames
-kdegames-minimal
-
-### space issues
-
-# fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts			# a compact CJK font, to replace:
--naver-nanum-gothic-fonts		# Korean
--vlgothic-fonts				# Japanese
--adobe-source-han-sans-cn-fonts		# simplified Chinese
--adobe-source-han-sans-tw-fonts 	# traditional Chinese
-
--paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
-#-stix-fonts		# mathematical symbols
-
-# remove input methods to free space
--@input-methods
--scim*
--m17n*
--ibus*
--iok
-
-# save some space (from @standard)
--make
-
-# admin-tools
--gnome-disk-utility
-# kcm_clock still lacks some features, so keep system-config-date around
-#-system-config-date
-# prefer kcm_systemd
--system-config-services
-# prefer/use kusers
--system-config-users
-
-## avoid serious bugs by omitting broken stuff
-
-%end
-
 %post
 %end

fedora-live-lxde.ks

@@ -8,7 +8,7 @@
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-lxde-packages.ks
+%include fedora-lxde-common.ks
 
 %post
 # LXDE and LXDM configuration

fedora-live-lxqt.ks

@@ -0,0 +1,51 @@
+# fedora-live-lxqt.ks
+#
+# Description:
+# – Fedora Live Spin with the LXQt desktop environment
+#
+# Maintainer(s):
+# – Christian Dersch <lupinix@fedoraproject.org>
+#
+
+%include fedora-live-base.ks
+%include fedora-live-minimization.ks
+%include fedora-lxqt-common.ks
+
+%post
+# add initscript
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+# 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=lxqt.desktop/' /etc/sddm.conf
+else
+cat > /etc/sddm.conf << SDDM_EOF
+[Autologin]
+User=liveuser
+Session=lxqt.desktop
+SDDM_EOF
+fi
+
+# show liveinst.desktop on desktop and in menu
+sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
+
+# set up preferred apps 
+cat > /etc/xdg/libfm/pref-apps.conf << FOE 
+[Preferred Applications]
+WebBrowser=qupzilla.desktop
+FOE
+
+# no updater applet in live environment
+rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+EOF
+
+%end
+

fedora-live-mate_compiz.ks

@@ -4,48 +4,11 @@
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-mate-packages.ks
+%include fedora-mate-common.ks
 %include fedora-live-minimization.ks
 
 part / --size 6144
 
-%packages
-
-# Drop things for size
--@3d-printing
--brasero
--colord
--fedora-icon-theme
--GConf2
--gnome-bluetooth-libs
--gnome-icon-theme
--gnome-icon-theme-symbolic
--gnome-software
--gnome-themes
--gnome-themes-standard
--gnome-user-docs
-
--@mate-applications
--mate-icon-theme-faenza
-
-# Drop oversized fonts that aren't needed
-
-# Drop things that pull in perl
-
-# 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
-
-# Help and art can be big, too
--gnome-user-docs
--evolution-help
-
-# Legacy cmdline things we don't want
--telnet
-
-%end
-
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
 
@@ -58,6 +21,9 @@ fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 
+# and mark it as executable
+chmod +x /home/liveuser/Desktop/liveinst.desktop
+
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 

fedora-live-python-classroom.ks

@@ -0,0 +1,9 @@
+# Maintained by the Fedora Python SIG:
+# http://fedoraproject.org/wiki/SIGs/Python
+# mailto:python-devel@lists.fedoraproject.org
+
+# The Workstion based Python Classroom Lab
+
+%include fedora-live-workstation.ks
+%include fedora-live-minimization.ks
+%include fedora-python-classroom-gnome-common.ks

fedora-live-scientific_kde.ks

@@ -44,7 +44,7 @@ ddd
 valgrind
 
 #python 2 tools/libraries not included from the groups
-python-tools
+python2-tools
 python-ipython
 python-ipython-console
 python-ipython-notebook
@@ -113,7 +113,6 @@ valgrind-openmpi
 libgomp
 python-pp
 mpi4py-openmpi
-python3-mpi4py-openmpi
 
 #Version control- a GUI for each as well
 

fedora-live-soas.ks

@@ -10,88 +10,10 @@
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-soas-packages.ks
-
-firewall --enabled --service=mdns,presence
+%include fedora-soas-common.ks
 
 %post
 
-# Rebuild initrd for Sugar boot screen
-KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-/usr/sbin/plymouth-set-default-theme sugar
-/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
-
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
-# Get proper release naming in the control panel
-cat >> /boot/olpc_build << EOF
-Sugar on a Stick
-EOF
-cat /etc/fedora-release >> /boot/olpc_build
-
-# Add our activities to the favorites
-cat > /usr/share/sugar/data/activities.defaults << EOF
-org.laptop.WebActivity
-org.laptop.HelpActivity
-org.laptop.Chat
-org.laptop.sugar.ReadActivity
-org.laptop.sugar.GetBooksActivity
-org.laptop.AbiWordActivity
-org.laptop.TurtleArtActivity
-org.laptop.Calculate
-org.laptop.Clock
-org.laptop.ImageViewerActivity
-org.laptop.Memorize
-org.laptop.physics
-org.laptop.Pippy
-org.laptop.RecordActivity
-org.laptop.Oficina
-org.laptop.StopWatchActivity
-org.laptop.community.Finance
-org.laptop.community.TypingTurtle
-org.laptop.sugar.Jukebox
-org.laptop.Words
-org.eq.FotoToon
-org.gnome.Labyrinth
-com.laptop.Ruler
-org.sugarlabs.AbacusActivity
-org.sugarlabs.IRC
-org.sugarlabs.InfoSlicer
-org.sugarlabs.PortfolioActivity
-org.sugarlabs.StoryActivity
-org.sugarlabs.VisualMatchActivity
-com.garycmartin.Moon
-mulawa.Countries
-tv.alterna.Clock
-vu.lux.olpc.Maze
-vu.lux.olpc.Speak
-EOF
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/sugar
-DISPLAYMANAGER=/usr/sbin/lightdm
-EOF
-
-# set up lightdm autologin
-sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
-sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
-
-# Don't use the default system user (in SoaS liveuser) as nick name
-# Disable the logout menu item in Sugar
-# Enable Sugar power management
-cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
-[org.sugarlabs.user]
-default-nick='disabled'
-
-[org.sugarlabs]
-show-logout=false
-
-[org.sugarlabs.power]
-automatic=true
-EOF
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
-
 cat >> /etc/rc.d/init.d/livesys << EOF
 # set up lightdm autologin
 sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf

fedora-live-workstation.ks

@@ -3,8 +3,12 @@
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-workstation-packages.ks
-%include snippets/packagekit-cached-metadata.ks
+%include fedora-workstation-common.ks
+#
+# Disable this for now as 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

@@ -11,7 +11,7 @@
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-xfce-packages.ks
+%include fedora-xfce-common.ks
 
 %post
 # xfce configuration

fedora-lxde-common.ks

@@ -43,7 +43,6 @@ metacity
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
--realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -foomatic-db-ppds
 -foomatic

fedora-lxqt-common.ks

@@ -0,0 +1,52 @@
+# fedora-lxqt-common.ks
+#
+# Description:
+# – Fedora Live Spin with the LXQt desktop environment
+#
+# Maintainer(s):
+# – Christian Dersch <lupinix@fedoraproject.org>
+#
+
+%packages
+@lxqt
+@lxqt-apps
+@lxqt-media
+@networkmanager-submodules
+
+# for nm applet
+gnome-keyring
+
+
+# l10n
+lxqt-l10n
+lximage-qt-l10n
+obconf-qt-l10n
+pavucontrol-qt-l10n
+
+# MP3
+gstreamer1-plugin-mpg123
+
+# remove unneeded stuff to get a lightweight system
+# fonts (we make no bones about admitting we're english-only)
+wqy-microhei-fonts          # a compact CJK font, to replace:
+-naver-nanum-gothic-fonts       # Korean
+-vlgothic-fonts             # Japanese
+-adobe-source-han-sans-cn-fonts     # simplified Chinese
+-adobe-source-han-sans-tw-fonts     # traditional Chinese
+
+-paratype-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge
+#-stix-fonts        # mathematical symbols
+
+# remove input methods to free space
+-@input-methods
+-scim*
+-m17n*
+-ibus*
+-iok
+
+# Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132
+# Why is this not pulled in by anaconda???
+storaged
+
+%end
+

fedora-mate-common.ks

@@ -16,17 +16,12 @@ emerald-themes
 emerald
 fusion-icon
 @networkmanager-submodules
-blueman
+blueberry
 
 # some apps from mate-applications
 caja-actions
 mate-disk-usage-analyzer
 
-# more backgrounds
-f24-backgrounds-base
-f24-backgrounds-mate
-f24-backgrounds-extras-base
-
 # system tools
 system-config-printer
 system-config-printer-applet
@@ -35,7 +30,7 @@ lightdm-gtk-greeter-settings
 # audio video
 parole
 exaile
-PackageKit-gstreamer-plugin
+gstreamer1-plugins-ugly-free # mp3 support
 
 # blacklist applications which breaks mate-desktop
 -audacious
@@ -54,4 +49,24 @@ p7zip-plugins
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns
 
+# Drop things for size
+-@3d-printing
+-brasero
+-colord
+-fedora-icon-theme
+-gnome-icon-theme
+-gnome-icon-theme-symbolic
+-gnome-software
+-gnome-user-docs
+
+-@mate-applications
+-mate-icon-theme-faenza
+
+# Help and art can be big, too
+-gnome-user-docs
+-evolution-help
+
+# Legacy cmdline things we don't want
+-telnet
+
 %end

fedora-minimal-common.ks

@@ -0,0 +1,19 @@
+%packages
+-@standard
+-initial-setup-gui
+-generic-release*
+-glibc-all-langpacks
+glibc-langpack-en
+iw
+NetworkManager-wifi
+%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 .
+
+%end

fedora-python-classroom-common.ks

@@ -0,0 +1,22 @@
+# Maintained by the Fedora Python SIG:
+# http://fedoraproject.org/wiki/SIGs/Python
+# mailto:python-devel@lists.fedoraproject.org
+
+# Common packages of all Python Classroom images
+
+%packages
+@python-classroom
+@python-science
+nano
+openssh-clients
+vim-enhanced
+wget
+
+# Remove Pythons possibly recommended by tox
+-python26
+-python33
+-python34
+-python35
+-pypy
+
+%end

fedora-python-classroom-gnome-common.ks

@@ -0,0 +1,103 @@
+# Maintained by the Fedora Python SIG:
+# http://fedoraproject.org/wiki/SIGs/Python
+# mailto:python-devel@lists.fedoraproject.org
+
+# GNOME part of Python Classroom images
+
+%include fedora-python-classroom-common.ks
+
+%packages
+ninja-ide
+emacs
+python3-matplotlib-tk
+python3-pillow-tk
+
+# Remove extra gnome-y things
+-@graphical-internet
+-@games
+-@sound-and-video
+-@multimedia
+-dleyna*
+-evolution*
+-gnome-boxes
+-gnome-calendar
+-gnome-clocks
+-gnome-contacts
+-gnome-disk-utility
+-gnome-documents
+-gnome-font-viewer
+-gnome-maps
+-gnome-weather
+-grilo-plugins
+-cheese
+-totem
+-totem-nautilus
+
+# This is no longer workstation
+-@workstation-product
+-fedora-productimg-workstation
+
+# Add a web browser
+@firefox
+
+# Remove office suite
+-@libreoffice
+-libreoffice-*
+-planner
+
+# Drop the Java plugin and Java
+-icedtea-web
+-java*
+
+# No printing
+-@printing
+-foomatic-db-ppds
+-foomatic
+
+# Dictionaries are big
+-aspell-*
+-words
+
+# Help and art can be big, too
+-gnome-user-docs
+-desktop-backgrounds-basic
+-*backgrounds-extras
+
+# Legacy cmdline things we don't want
+-krb5-auth-dialog
+-krb5-workstation
+-pam_krb5
+-quota
+-dos2unix
+-finger
+-ftp
+-jwhois
+-mtr
+-pinfo
+-rsh
+-nfs-utils
+-ypbind
+-yp-tools
+-rpcbind
+-acpid
+-ntsysv
+
+# Don't need this
+-linux-atm
+
+# Drop some system-config things
+-system-config-language
+-system-config-network
+-system-config-rootpassword
+-system-config-services
+-policycoreutils-gui
+
+%end
+
+
+%post
+
+#Override the favorite desktop application in Dash
+sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'anaconda.desktop']/" /etc/rc.d/init.d/livesys
+
+%end

fedora-python-classroom-vagrant.ks

@@ -0,0 +1,8 @@
+# Maintained by the Fedora Python SIG:
+# http://fedoraproject.org/wiki/SIGs/Python
+# mailto:python-devel@lists.fedoraproject.org
+
+# Like the Python Classroom image, but tuned for vagrant.
+
+%include fedora-cloud-base-vagrant.ks
+%include fedora-python-classroom-common.ks

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
+repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?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
+repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?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-common.ks

@@ -0,0 +1,165 @@
+# fedora-livecd-soas.ks
+#
+# Description:
+# - A Sugar environment that you can carry in your pocket
+#
+# Maintainers:
+# - Peter Robinson <pbrobinson AT gmail DOT com>
+
+firewall --enabled --service=mdns,presence
+
+%packages
+-@fonts
+-@dial-up
+-@multimedia
+-@printing
+-foomatic
+-@gnome-desktop 
+-yp-tools
+-ypbind
+-rdate
+-rdist
+-icedtea-web
+-firefox
+-glx-utils
+-nmap-ncat
+-PackageKit
+-eekboard-libs
+-open-vm-tools*
+-gfs2-utils
+-abrt-cli
+-ibus*
+-hyperv-daemons
+-webkitgtk4-plugin-process-gtk2
+webkitgtk3
+
+# Add some extra fonts
+dejavu-sans-fonts
+dejavu-sans-mono-fonts
+madan-fonts
+aajohan-comfortaa-fonts
+sil-abyssinica-fonts
+vlgothic-fonts
+
+# == Core Sugar Platform ==
+@sugar-desktop
+-sugar-ruler
+sugar-cp-updater
+lightdm
+lightdm-gtk
+
+# Write breaks unless we do this (we don't need it anyway)
+# enable for testing in the F17 dev cycle
+@input-methods
+
+# Needed for wifi, bluetooth and WWAN connection support
+@networkmanager-submodules
+
+# == Platform Components ==
+# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
+alsa-plugins-pulseaudio
+alsa-utils
+gstreamer1-plugins-base
+gstreamer1-plugins-good
+gstreamer1-plugins-bad-free
+gstreamer-plugins-espeak
+pulseaudio
+pulseaudio-utils
+
+# explicitly remove openbox and hopefully deal with what firstboot wants
+-openbox
+
+# remove deps that come from god knows where
+-sane-backends
+-sane-backends-drivers-scanners
+
+# Usefulness for DSL connections as per:
+# http://bugs.sugarlabs.org/ticket/1951
+rp-pppoe
+
+# Get the Sugar boot screen
+-plymouth-system-theme
+-plymouth-theme-charge
+sugar-logos
+
+%end
+
+%post
+
+# Rebuild initrd for Sugar boot screen
+KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
+/usr/sbin/plymouth-set-default-theme sugar
+/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
+# Get proper release naming in the control panel
+cat >> /boot/olpc_build << EOF
+Sugar on a Stick
+EOF
+cat /etc/fedora-release >> /boot/olpc_build
+
+# Add our activities to the favorites
+cat > /usr/share/sugar/data/activities.defaults << EOF
+org.laptop.WebActivity
+org.laptop.HelpActivity
+org.laptop.Chat
+org.laptop.sugar.ReadActivity
+org.laptop.sugar.GetBooksActivity
+org.laptop.AbiWordActivity
+org.laptop.TurtleArtActivity
+org.laptop.Calculate
+org.laptop.Clock
+org.laptop.ImageViewerActivity
+org.laptop.Memorize
+org.laptop.physics
+org.laptop.Pippy
+org.laptop.RecordActivity
+org.laptop.Oficina
+org.laptop.StopWatchActivity
+org.laptop.community.Finance
+org.laptop.community.TypingTurtle
+org.laptop.sugar.Jukebox
+org.laptop.Words
+org.eq.FotoToon
+org.gnome.Labyrinth
+com.laptop.Ruler
+org.sugarlabs.AbacusActivity
+org.sugarlabs.IRC
+org.sugarlabs.InfoSlicer
+org.sugarlabs.PortfolioActivity
+org.sugarlabs.StoryActivity
+org.sugarlabs.VisualMatchActivity
+com.garycmartin.Moon
+mulawa.Countries
+tv.alterna.Clock
+vu.lux.olpc.Maze
+vu.lux.olpc.Speak
+EOF
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/sugar
+DISPLAYMANAGER=/usr/sbin/lightdm
+EOF
+
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+
+# Don't use the default system user (in SoaS liveuser) as nick name
+# Disable the logout menu item in Sugar
+# Enable Sugar power management
+cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
+[org.sugarlabs.user]
+default-nick='disabled'
+
+[org.sugarlabs]
+show-logout=false
+
+[org.sugarlabs.power]
+automatic=true
+EOF
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
+
+%end

fedora-soas-packages.ks

@@ -1,86 +0,0 @@
-# fedora-livecd-soas.ks
-#
-# Description:
-# - A Sugar environment that you can carry in your pocket
-#
-# Maintainers:
-# - Peter Robinson <pbrobinson AT gmail DOT com>
-# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
-# - Mel Chua <mchua AT fedoraproject DOT org>
-
-%packages
--@fonts
--@dial-up
--@multimedia
--@printing
--foomatic
--@gnome-desktop 
--yp-tools
--ypbind
--rdate
--rdist
--icedtea-web
--firefox
--glx-utils
--nmap-ncat
--PackageKit
--libfprint
--realmd
--eekboard-libs
--open-vm-tools*
--gfs2-utils
--abrt-cli
--ibus*
--hyperv-daemons
--webkitgtk4-plugin-process-gtk2
-
-# Add some extra fonts
-dejavu-sans-fonts
-dejavu-sans-mono-fonts
-madan-fonts
-aajohan-comfortaa-fonts
-sil-abyssinica-fonts
-vlgothic-fonts
-
-# == Core Sugar Platform ==
-@sugar-desktop
--sugar-ruler
-sugar-cp-updater
-lightdm
-lightdm-gtk
-
-# Write breaks unless we do this (we don't need it anyway)
-# enable for testing in the F17 dev cycle
-@input-methods
-
-# Needed for wifi, bluetooth and WWAN connection support
-@networkmanager-submodules
-
-# == Platform Components ==
-# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
-alsa-plugins-pulseaudio
-alsa-utils
-gstreamer1-plugins-base
-gstreamer1-plugins-good
-gstreamer1-plugins-bad-free
-gstreamer-plugins-espeak
-pulseaudio
-pulseaudio-utils
-
-# explicitly remove openbox and hopefully deal with what firstboot wants
--openbox
-
-# remove deps that come from god knows where
--sane-backends
--sane-backends-drivers-scanners
-
-# Usefulness for DSL connections as per:
-# http://bugs.sugarlabs.org/ticket/1951
-rp-pppoe
-
-# Get the Sugar boot screen
--plymouth-system-theme
--plymouth-theme-charge
-sugar-logos
-
-%end

fedora-xfce-common.ks

@@ -38,7 +38,6 @@ system-config-printer
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
--realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
 -xfce4-sensors-plugin

l10n/fedora-livecd-cinnamon-de_DE.ks

@@ -0,0 +1,20 @@
+# fedora-livecd-cinnamon-de_DE.ks
+#
+# Description:
+# - German Fedora Live Spin with the Cinnamon Desktop Environment
+#
+# Maintainer(s):
+# - Björn Esser <besser82@fedoraproject.org>
+
+%include ../fedora-live-cinnamon.ks
+
+lang de_DE.UTF-8
+keyboard de-latin1-nodeadkeys
+timezone Europe/Berlin
+
+%packages
+@german-support
+# exclude input methods
+-m17n*
+-scim*
+%end

l10n/fedora-livecd-cinnamon-ja_JP.ks

@@ -0,0 +1,35 @@
+# fedora-livecd-cinnamon-ja_JP.ks
+#
+# Description:
+# - Japanese Fedora Live Spin with the Cinnamon Desktop Environment
+#
+# Maintainer(s):
+# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
+
+%include ../fedora-live-cinnamon.ks
+
+lang ja_JP.UTF-8
+keyboard jp
+timezone Asia/Tokyo
+
+%packages
+@japanese-support
+# exclude input methods except ibus:
+-m17n*
+-scim*
+-iok
+%end
+
+%post
+cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
+# Read and parsed by systemd-localed. It's probably wise not to edit this file
+# manually too freely.
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "jp"
+        Option "XkbModel" "jp106"
+EndSection
+EOF
+%end
+

l10n/fedora-livecd-lxde-ja_JP.ks

@@ -0,0 +1,61 @@
+# fedora-livecd-lxde-ja_JP.ks
+#
+# Description:
+# - Japanese Fedora Live Spin with the LXDE Desktop Environment
+#
+# Maintainer(s):
+# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
+
+%include ../fedora-live-lxde.ks
+
+lang ja_JP.UTF-8
+keyboard jp
+timezone Asia/Tokyo
+
+%packages
+@japanese-support
+# exclude input methods:
+-m17n*
+-scim*
+-ibus*
+-iok
+# Better more popular browser
+firefox
+# ibus stuff
+ibus-kkc
+imsettings
+%end
+
+%post
+cat >> /etc/rc.d/init.d/livesys << EOF
+#### setting env and start ibus-deamon ####
+#mkdir /home/liveuser
+cat >> /home/liveuser/.bash_profile << FOE
+export XMODIFIERS="@im=ibus"
+export GTK_IM_MODULE=ibus
+export QT_IM_MODULE=ibus
+ibus-daemon -drx
+FOE
+#### autostart ibus and stuff ####
+cat > /etc/xdg/autostart/imsettings-start.desktop << "FOE"
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Version=1.0
+Name=Input Method starter
+Name[ja]=入力メソッドのスターター
+Exec=imsettings-switch -n -q -x
+Terminal=false
+FOE
+EOF
+cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
+# Read and parsed by systemd-localed. It's probably wise not to edit this file
+# manually too freely.
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "jp"
+        Option "XkbModel" "jp106"
+EndSection
+EOF
+%end

l10n/fedora-livecd-xfce-ja_JP.ks

@@ -0,0 +1,38 @@
+# fedora-livecd-xfce-ja_JP.ks
+#
+# Description:
+# - Japanese Fedora Live Spin with the Xfce Desktop Environment
+#
+# Maintainer(s):
+# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
+
+%include ../fedora-live-xfce.ks
+
+lang ja_JP.UTF-8
+keyboard jp
+timezone Asia/Tokyo
+
+%packages
+@japanese-support
+# exclude input methods except ibus:
+-m17n*
+-scim*
+-iok
+
+# ibus-kkc 
+ibus-kkc
+%end
+
+%post
+cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
+# Read and parsed by systemd-localed. It's probably wise not to edit this file
+# manually too freely.
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "jp"
+        Option "XkbModel" "jp106"
+EndSection
+EOF
+%end
+

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,22 +19,22 @@ 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/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=https://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
   cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \
          $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo
 fi
 if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then
   cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \
          $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo
 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/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=https://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