initial Fedora 25 branched setup

Signed-off-by: Peter Robinson <Peter Robinson pbrobinson@fedoraproject.org>
2025-12-09 00:20:31 +08:00 · 2016-07-26 06:51:27 +01:00
121 changed files with 1239 additions and 1998 deletions
--- a/README.md
+++ b/README.md
@@ -11,18 +11,18 @@ 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
+ * 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 #

--- a/atomic-installer/lorax-configure-repo.tmpl
+++ b/atomic-installer/lorax-configure-repo.tmpl
@@ -0,0 +1,8 @@
+## Lorax template to configure Anaconda to use the local OSTree
+## repository on disk.
+
+<%page args="ostree_osname, ostree_ref"/>
+append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
+append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
+
--- a/atomic-installer/lorax-embed-repo.tmpl
+++ b/atomic-installer/lorax-embed-repo.tmpl
@@ -0,0 +1,11 @@
+## Lorax template to embed an OSTree repository into the installer.iso
+## and configure an interactive installer use to look for it.
+##
+## Note that we pull with depth=0 to only get *one* commit into the
+## ISO, because we obviously don't want the full history.
+
+<%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>
+runcmd mkdir -p ${workdir}/iso-graft/content/repo
+runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2
+runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}
+runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}
--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@@ -0,0 +1,99 @@
+# Kickstart file to build the appliance operating
+# system for fedora.
+# This is based on the work at http://www.thincrust.net
+lang C
+keyboard us
+timezone US/Eastern
+auth --useshadow --passalgo=sha512
+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
+# By default the root password is emptied
+#rootpw --iscrypted $1$uw6MV$m6VtUWPed4SqgoW6fKfTZ/
+
+#
+# Partition Information. Change this as necessary
+# This information is used by appliance-tools but
+# not by the livecd tools.
+#
+part / --size 1024 --fstype ext4 --ondisk sda
+
+#
+# Repositories
+#
+%include fedora-repo.ks
+
+#
+# Add all the packages after the base packages
+#
+%packages --excludedocs --nobase
+bash
+kernel
+grub
+e2fsprogs
+passwd
+policycoreutils
+chkconfig
+rootfiles
+yum
+vim-minimal
+acpid
+#needed to disable selinux
+lokkit
+
+#Allow for dhcp access
+dhclient
+iputils
+
+#
+# Packages to Remove
+#
+
+# no need for kudzu if the hardware doesn't change
+-kudzu
+-prelink
+-setserial
+-ed
+
+# Remove the authconfig pieces
+-authconfig
+-rhpl
+-wireless-tools
+
+# Remove the kbd bits
+-kbd
+-usermode
+
+# these are all kind of overkill but get pulled in by mkinitrd ordering
+-mkinitrd
+-kpartx
+-dmraid
+-mdadm
+-lvm2
+-tar
+
+# selinux toolchain of policycoreutils, libsemanage, ustr
+-policycoreutils
+-checkpolicy
+-selinux-policy*
+-libselinux-python
+-libselinux
+
+# Things it would be nice to loose
+-fedora-logos
+generic-logos
+-fedora-release-notes
+%end
+
+#
+# Add custom post scripts after the base post.
+#
+%post
+
+%end
+
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -4,15 +4,17 @@ auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns,ssh

-bootloader --location=mbr
+# configure extlinux bootloader
+bootloader extlinux

-part /boot/efi --size=80 --fstype vfat --asprimary
-part /boot --size=512 --fstype ext4 --asprimary
+part /boot --size=512 --fstype ext4
+part swap --size=512 --fstype swap
+part / --size=3584 --fstype ext4

 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig

-services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-swap
+services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup --disabled=network

 %include fedora-repo.ks

@@ -20,40 +22,33 @@ services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-s
@core
@standard
@hardware-support
-zram
+@dial-up

 kernel
-# 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*
-usb_modeswitch
 #lets resize / on first boot
 # dracut-modules-growroot

+# remove this in %post
+dracut-config-generic
+
+
 # make sure all the locales are available for inital0-setup and anaconda to work
 glibc-all-langpacks
 %end

 %post

-# Setup Raspberry Pi firmware
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
-
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=armhfp
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this ARM disk image"
@@ -71,8 +66,5 @@ systemctl mask tmp.mount

 dnf -y remove dracut-config-generic

-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
 %end
+
--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -1,9 +1,12 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-kde-common.ks
+%include fedora-kde-packages.ks

-part / --size=6300 --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
--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@@ -1,9 +1,10 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-lxde-common.ks
-
-part / --size=4000 --fstype ext4
+%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
--- a/fedora-arm-lxqt.ks
+++ b/fedora-arm-lxqt.ks
@@ -1,14 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-lxqt-common.ks
-
-part / --size=4400 --fstype ext4 --asprimary
-
-%packages
-# trojita not available on non-x86 platforms
-trojita
-%end
-
-%post
-
-%end
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -1,9 +1,12 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-mate-common.ks
+%include fedora-mate-packages.ks

-part / --size=7168 --fstype ext4
+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
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -1,8 +1,27 @@
 %include fedora-arm-base.ks
-%include fedora-minimal-common.ks

-part / --size=1400 --fstype ext4
+part /boot --size=512 --fstype ext4
+part swap --size=256 --fstype swap
+part / --size=1279 --fstype ext4

 %packages
-xkeyboard-config
+-@standard
+-@dial-up
+-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
+
--- a/fedora-arm-python-classroom.ks
+++ b/fedora-arm-python-classroom.ks
@@ -1,8 +0,0 @@
-# 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
--- a/fedora-arm-server.ks
+++ b/fedora-arm-server.ks
@@ -1,16 +1,14 @@
 %include fedora-arm-base.ks

 # server defaults to xfs for / so lets do so on arm also
-part / --size=2500 --fstype xfs
+part / --size=3000 --fstype xfs

 %packages
-# install the default groups for the server environment since installing the environment is not working
+-@dial-up
+# install the default groups for the server evironment since installing the environment is not working
@server-product
@standard
@headless-management
-@hardware-support
-@networkmanager-submodules
-
@container-management
@domain-client
 -initial-setup-gui
--- a/fedora-arm-soas.ks
+++ b/fedora-arm-soas.ks
@@ -1,9 +1,10 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-soas-common.ks
-
-part / --size=3300 --fstype ext4 --asprimary
+%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
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@@ -1,19 +1,12 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-workstation-common.ks
+%include fedora-workstation-packages.ks

-part / --size=6200 --fstype ext4
+part / --size=5500 --fstype ext4

 %packages
 -initial-setup
 -initial-setup-gui
-libvirt*
-gnome-boxes

 %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
--- a/fedora-arm-xbase.ks
+++ b/fedora-arm-xbase.ks
@@ -4,14 +4,5 @@
@input-methods
@multimedia
@printing
-epiphany
 %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
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@@ -1,9 +1,12 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-xfce-common.ks
+%include fedora-xfce-packages.ks

-part / --size=4700 --fstype ext4
+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
--- a/fedora-atomic-vagrant.ks
+++ b/fedora-atomic-vagrant.ks
@@ -0,0 +1,36 @@
+# Like the Atomic 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
+
+# The addition of the net.ifnames=0 and biosdevnames=0 option ensures that
+# 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"
+
+
+%post --erroronfail
+
+# Work around cloud-init being both disabled and enabled; need
+# to refactor to a common base.
+systemctl mask cloud-init cloud-init-local cloud-config cloud-final
+
+# Vagrant setup
+sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
+echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
+mkdir -m 0700 -p ~vagrant/.ssh
+cat > ~vagrant/.ssh/authorized_keys << EOKEYS
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
+EOKEYS
+chmod 600 ~vagrant/.ssh/authorized_keys
+chown -R vagrant:vagrant ~vagrant/.ssh/
+
+%end
+
--- a/fedora-atomic.ks
+++ b/fedora-atomic.ks
@@ -0,0 +1,129 @@
+# Fedora Atomic is a cloud-focused spin implementing the Project
+# Atomic patterns.  Note that this replicates the same tree which can
+# now be installed on bare metal.
+
+# This image allocates most space to an LVM-managed thin pool
+# dedicated for Docker containers, and uses docker-storage-setup to
+# dynamically resize storage on boot.
+
+text
+lang en_US.UTF-8
+keyboard us
+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"
+
+network --bootproto=dhcp --device=link --activate --onboot=on
+services --disabled=network
+services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+
+zerombr
+clearpart --all
+# Atomic differs from cloud - we want LVM
+part /boot --size=300 --fstype="ext4"
+part pv.01 --grow
+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/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/25/'
+
+# 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
+
+# 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 -n "Getty fixes"
+# although we want console output going to the serial console, we don't
+# actually have the opportunity to login there. FIX.
+# we don't really need to auto-spawn _any_ gettys.
+sed -i '/^#NAutoVTs=.*/ a\
+NAutoVTs=0' /etc/systemd/logind.conf
+
+echo -n "Network fixes"
+# initscripts don't like this file to be missing.
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+EOF
+
+# For cloud images, 'eth0' _is_ the predictable device name, since
+# we don't want to be tied to specific virtual (!) hardware
+rm -f /etc/udev/rules.d/70*
+ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+
+# simple eth0 config, again not hard-coded to the build hardware
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+ONBOOT="yes"
+TYPE="Ethernet"
+PERSISTENT_DHCLIENT="yes"
+EOF
+
+# generic localhost names
+cat > /etc/hosts << EOF
+127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+
+EOF
+echo .
+
+
+# Because memory is scarce resource in most cloud/virt environments,
+# and because this impedes forensics, we are differing from the Fedora
+# default of having /tmp on tmpfs.
+echo "Disabling tmpfs for /tmp."
+systemctl mask tmp.mount
+
+# make sure firstboot doesn't start
+echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
+
+# Uncomment this if you want to use cloud init but suppress the creation
+# of an "ec2-user" account. This will, in the absence of further config,
+# cause the ssh key from a metadata source to be put in the root account.
+#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
+#users: []
+#disable_root: 0
+#EOF
+
+echo "Removing random-seed so it's not the same in every image."
+rm -f /var/lib/random-seed
+
+echo "Packages within this cloud image:"
+echo "-----------------------------------------------------------------------"
+rpm -qa
+echo "-----------------------------------------------------------------------"
+# Note that running rpm recreates the rpm db files which aren't needed/wanted
+rm -f /var/lib/rpm/__db*
+
+echo "Zeroing out empty space."
+# This forces the filesystem to reclaim space from deleted files
+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.)"
+
+echo "Adding Developer Mode GRUB2 menu item."
+/usr/libexec/atomic-devmode/bootentry add
+
+%end
+
--- a/fedora-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@@ -1,20 +0,0 @@
-# fedora-cinnamon-common.ks
-#
-# Description:
-# - Fedora package set for the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%packages
-
-@networkmanager-submodules
-@cinnamon-desktop
-@libreoffice
-parole
-exaile
-
-# extra backgrounds
-f31-backgrounds-extras-gnome
-
-%end
--- a/fedora-cinnamon-packages.ks
+++ b/fedora-cinnamon-packages.ks
@@ -0,0 +1,32 @@
+# fedora-cinnamon-packages.ks
+#
+# Description:
+# - Fedora package set for the Cinnamon Desktop Environment
+#
+# Maintainer(s):
+# - Dan Book <grinnz@grinnz.com>
+
+%packages
+
+@networkmanager-submodules
+@cinnamon-desktop
+@libreoffice
+
+# internet and multimedia
+pidgin
+hexchat
+transmission
+parole
+
+# make sure we have a graphical installer
+yumex-dnf
+
+# extra backgrounds
+desktop-backgrounds-basic
+f24-backgrounds-extras-gnome
+
+# save some space
+-fedora-icon-theme
+-PackageKit*                # we switched to yumex, so we don't need this
+
+%end
--- a/fedora-cloud-atomic-pxetolive.ks
+++ b/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
+services --disabled=docker-storage-setup,network
 services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
@@ -28,9 +28,4 @@ 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
--- a/fedora-cloud-base-arm.ks
+++ b/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
--- a/fedora-cloud-base-ppc.ks
+++ b/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
--- a/fedora-cloud-base-vagrant.ks
+++ b/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
@@ -32,7 +32,8 @@ dnf-yum
 # users setup. This can actually take a bit of time.  Just fold it
 # in to the base box disk image
 rsync
-# Add in sshfs for vagrant-sshfs plugin
+# 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

@@ -44,7 +45,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=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
 sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
 mkdir -m 0700 -p ~vagrant/.ssh
 cat > ~vagrant/.ssh/authorized_keys << EOKEYS
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -1,10 +1,10 @@
-# This is a basic Fedora cloud spin designed to work in OpenStack and other
+# This is a basic Fedora 21 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 Fedora install, this image has /tmp on disk
+# Note that unlike the standard F20 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).
@@ -13,18 +13,18 @@
 # http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
 #
 # For a TDL file, I store one here:
-# https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
+# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
 # (Koji generates one internally...what we really want is Koji to publish it statically)
-#
+# 
 # Once you have imagefactory and imagefactory-plugins installed, run:
-#
-#   curl -O https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
+# 
+#   curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl 
 #   tempfile=$(mktemp --suffix=.ks)
 #   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
 #   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
 #

-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+cmdline
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
@@ -32,18 +32,18 @@ timezone --utc Etc/UTC
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
+user --name=none

 firewall --disabled

-# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
-bootloader --timeout=1 --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux

 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final

 zerombr
 clearpart --all
-autopart --noboot --nohome --noswap --nolvm
+part / --fstype ext4 --grow

 %include fedora-repo.ks

@@ -75,15 +75,14 @@ which
 # Need to also add back plymouth in order to mask failure of
 # systemd-vconsole-setup.service. BZ#1272684. Comment out for now
 #-plymouth
+-NetworkManager
 -iprutils
 # Now that BZ#1199868 is fixed kbd really gets removed but it breaks
 # systemd-vconsole-setup.service on boot. Comment out for now
 #-kbd
 -uboot-tools
 -kernel
-# No need for plymouth. Also means anaconda won't put rhgb/quiet
-# on kernel command line
-plymouth
+-grub2

 %end

@@ -117,6 +116,12 @@ 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"
@@ -137,7 +142,7 @@ echo "Removing firewalld."
 # not work when package was installed by Anaconda instead of command line.
 # Also -- check if this is still even needed with new anaconda -- disabled
 # firewall should _not_ pull in this package.
-# dnf -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
 dnf -C -y erase "firewalld*"

 # Another one needed at install time but not after that, and it pulls
@@ -152,6 +157,9 @@ 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"
@@ -170,6 +178,11 @@ NOZEROCONF=yes
 DEVTIMEOUT=10
 EOF

+# For cloud images, 'eth0' _is_ the predictable device name, since
+# we don't want to be tied to specific virtual (!) hardware
+rm -f /etc/udev/rules.d/70*
+ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+
 # simple eth0 config, again not hard-coded to the build hardware
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
 DEVICE="eth0"
@@ -206,7 +219,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/systemd/random-seed
+rm -f /var/lib/random-seed

 echo "Cleaning old dnf repodata."
 # FIXME: clear history?
@@ -215,7 +228,7 @@ truncate -c -s 0 /var/log/dnf.log
 truncate -c -s 0 /var/log/dnf.rpm.log

 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch

@@ -226,13 +239,22 @@ 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
-# 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
+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
@@ -240,26 +262,8 @@ 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.)"

-# When we build the image with oz, dracut is used
-# and sets up a ifcfg-en<whatever> for the device. We don't
-# want to use this, we use eth0 so it is always the same.
-# So we remove all these ifcfg-en<whatever> devices so
-# The 'network' service can come up cleanly.
-rm -f /etc/sysconfig/network-scripts/ifcfg-en*
-
-# 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
+# For trac ticket https://fedorahosted.org/cloud/ticket/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3

 %end

--- a/fedora-cloud-bigdata.ks
+++ b/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"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux

 network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final

 zerombr
 clearpart --all
@@ -97,6 +97,10 @@ 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
@@ -112,12 +116,12 @@ rpm -e linux-firmware
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.
 echo "Removing firewalld."
-dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"

 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
-dnf -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"

 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -174,15 +178,15 @@ 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/systemd/random-seed
+rm -f /var/lib/random-seed

-echo "Cleaning old dnf repodata."
-dnf history new
-dnf clean all
-truncate -c -s 0 /var/log/dnf.log
+echo "Cleaning old yum repodata."
+yum history new
+yum clean all
+truncate -c -s 0 /var/log/yum.log

 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch

@@ -204,8 +208,10 @@ dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
-mkdir -p /var/cache/dnf
+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
@@ -213,9 +219,5 @@ 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

--- a/fedora-cloud-experimental.ks
+++ b/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"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux

 network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final

 zerombr
 clearpart --all
@@ -88,6 +88,10 @@ 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
@@ -103,12 +107,12 @@ rpm -e linux-firmware
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.
 echo "Removing firewalld."
-dnf -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"

 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
-dnf -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"

 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -165,15 +169,15 @@ 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/systemd/random-seed
+rm -f /var/lib/random-seed

-echo "Cleaning old dnf repodata."
-dnf history new
-dnf clean all
-truncate -c -s 0 /var/log/dnf.log
+echo "Cleaning old yum repodata."
+yum history new
+yum clean all
+truncate -c -s 0 /var/log/yum.log

 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch

@@ -196,7 +200,7 @@ dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
-mkdir -p /var/cache/dnf
+mkdir -p /var/cache/yum
 chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys
@@ -207,9 +211,5 @@ 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

--- a/fedora-container-base-minimal.ks
+++ b/fedora-container-base-minimal.ks
@@ -1,70 +0,0 @@
-# See fedora-container-common.ks for details on how to hack on container image kickstarts
-# This base is a stripped back Fedora image without python3/dnf.
-# If you need that use the standard base image.
-
-%include fedora-container-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
--- a/fedora-container-base.ks
+++ b/fedora-container-base.ks
@@ -1,65 +0,0 @@
-# See fedora-container-common.ks for details on how to hack on container image kickstarts
-# This base is a standard Fedora image with python3 and dnf
-
-%include fedora-container-common.ks
-
-%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
-rootfiles
-# https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
-fedora-repos-modular
-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
-sudo
-glibc-langpack-en
-cracklib-dicts
-langpacks-en
-%end
-
-%post --erroronfail --log=/root/anaconda-post.log
-# remove some extraneous files
-rm -rf /var/cache/dnf/*
-rm -rf /tmp/*
-
-# https://pagure.io/atomic-wg/issue/308
-printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1576993
-systemctl disable dnf-makecache.timer
-
-#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
-
-# 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
-rm /run/nologin # https://pagure.io/atomic-wg/issue/316
-
-# Final pruning
-rm -rfv /var/cache/* /var/log/* /tmp/*
-
-%end
-
-%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
-set -eux
-
-# 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
--- a/fedora-container-common.ks
+++ b/fedora-container-common.ks
@@ -1,80 +0,0 @@
-# This is the common bits between Fedora Container 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://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
-#
-# Then, once you have imagefactory and imagefactory-plugins installed, run:
-#
-#   ksflatten -c fedora-container-base[-minimal].ks -o fedora-container-base-test.ks
-#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-container-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 --excludeWeakdeps
-fedora-release-container
-bash
-coreutils
-glibc-minimal-langpack
-libcrypt
-rpm
-shadow-utils
-sssd-client
-util-linux
-#needed by Anaconda https://bugzilla.redhat.com/show_bug.cgi?id=1744115
-systemd
-kernel
-dosfstools
-e2fsprogs
-fuse-libs
-gnupg2-smime
-libss # used by e2fsprogs
-pinentry
-shared-mime-info
-trousers
-xkeyboard-config
-grubby
-
-%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=1727489
-echo 'LANG="C.UTF-8"' >  /etc/locale.conf
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
-echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
-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
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -1,88 +0,0 @@
-# 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,zram-swap
-network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
-shutdown
-
-bootloader --timeout=1
-
-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
-zram
-
-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
-# Intel wireless firmware assumed never of use for disk images
-iwl*
-ipw*
-usb_modeswitch
-generic-release*
-
-# make sure all the locales are available for inital0-setup and anaconda to work
-glibc-all-langpacks
-
-%end
-
-%post
-
-# Setup Raspberry Pi firmware
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-
-releasever=$(rpm --eval '%{fedora}')
-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
-
-# The enp1s0 interface is a left over from the imagefactory install, clean this up
-rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0
-
-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
--- a/fedora-disk-minimal.ks
+++ b/fedora-disk-minimal.ks
@@ -1,10 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-minimal-common.ks
-
-services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap
-
-autopart --type=plain --noswap
-
-%packages
-xkeyboard-config
-%end
--- a/fedora-disk-server.ks
+++ b/fedora-disk-server.ks
@@ -1,33 +0,0 @@
-%include fedora-disk-base.ks
-
-services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap
-
-autopart --noswap
-
-%packages
-# install the default groups for the server environment since installing the environment is not working
-@server-product
-@standard
-@core
-@headless-management
-@hardware-support
-@networkmanager-submodules
-
-@container-management
-@domain-client
-@guest-agents
-@server-hardware-support
-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
-
--- a/fedora-disk-workstation.ks
+++ b/fedora-disk-workstation.ks
@@ -1,19 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-disk-xbase.ks
-%include fedora-workstation-common.ks
-
-bootloader --append="cma=256MB"
-
-services --enabled=sshd,NetworkManager,chronyd,zram-swap
-
-autopart --type=plain --noswap
-
-%packages
-initial-setup
-initial-setup-gui
-
-%end
-
-%post
-
-%end
--- a/fedora-disk-xbase.ks
+++ b/fedora-disk-xbase.ks
@@ -1,21 +0,0 @@
-%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
--- a/fedora-disk-xfce.ks
+++ b/fedora-disk-xfce.ks
@@ -1,17 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-disk-xbase.ks
-%include fedora-xfce-common.ks
-
-bootloader --append="cma=192MB"
-
-services --enabled=sshd,NetworkManager,chronyd,zram-swap
-
-autopart --type=plain --noswap
-
-%packages
-
-%end
-
-%post
-
-%end
--- a/fedora-docker-base-arm.ks
+++ b/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
--- a/fedora-docker-base-ppc.ks
+++ b/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
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -0,0 +1,92 @@
+# 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
+#
+
+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
+
+%packages --excludedocs --instLangs=en --nocore
+bash
+fedora-release
+rootfiles
+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 -e
+
+# Set the language rpm nodocs transaction flag persistently in the
+# image yum.conf and rpm macros
+
+# 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
+
+echo "# fstab intentionally empty for containers" > /etc/fstab
+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*
+
+#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
+
+rm -f /etc/machine-id
+
+%end
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -1,105 +0,0 @@
-# This is the kickstart for Fedora IoT disk images.
-
-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-selinux --enforcing
-rootpw --lock --iscrypted locked
-
-bootloader --timeout=1 --append="net.ifnames=0 modprobe.blacklist=vc4"
-
-network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=NetworkManager,sshd,rngd,initial-setup,zram-swap
-
-# tell Initial Setup to run in the reconfig mode
-firstboot --reconfig --enable
-
-zerombr
-clearpart --all --initlabel --disklabel=msdos
-autopart --nohome --noswap --type=plain
-
-# Equivalent of %include fedora-repo.ks
-# Pull from the ostree repo that was created during the compose
-ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/stable/${basearch}/iot
-
-reboot
-
-%post --erroronfail
-# Find the architecture we are on
-arch=$(uname -m)
-
-# Setup Raspberry Pi firmware
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
-if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-else
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
-fi
-fi
-
-# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
-# We want consumers of this image to track the two week releases.
-ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/stable/${arch}/iot"
-
-# Make sure the ref we're supposedly sitting on (according
-# to the updated origin) exists.
-ostree refs "fedora-iot:fedora/stable/${arch}/iot" --create "fedora-iot:fedora/stable/${arch}/iot"
-
-# Remove the old ref so that the commit eventually gets cleaned up.
-ostree refs "fedora-iot:fedora/stable/${arch}/iot" --delete
-
-# delete/add the remote with new options to enable gpg verification
-# and to point them at the cdn url
-ostree remote delete fedora-iot
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/ --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
-
-# We're getting a stray console= from somewhere, work around it
-rpm-ostree kargs --delete=console=tty0
-
-# older versions of livecd-tools do not follow "rootpw --lock" line above
-# https://bugzilla.redhat.com/show_bug.cgi?id=964299
-passwd -l root
-
-# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
-cp /etc/skel/.bash* /var/roothome
-
-# Remove any persistent NIC rules generated by udev
-rm -vf /etc/udev/rules.d/*persistent-net*.rules
-# And ensure that we will do DHCP on eth0 on startup
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
-
-echo "Packages within this iot image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-echo "-----------------------------------------------------------------------"
-# Note that running rpm recreates the rpm db files which aren't needed/wanted
-rm -f /var/lib/rpm/__db*
-
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-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
-
-# 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
--- a/fedora-kde-common.ks
+++ b/fedora-kde-common.ks
@@ -1,59 +0,0 @@
-
-%packages
-@firefox
-@kde-apps
-@kde-desktop
-@kde-media
-@kde-office
-@networkmanager-submodules
-fedora-release-kde
-
-### The KDE-Desktop
-
-### Browser
-falkon
-
-### 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-connector-c
-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
-
-### space issues
-
-# 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
--- a/fedora-kde-minimization.ks
+++ b/fedora-kde-minimization.ks
@@ -1,8 +0,0 @@
-# remove input methods to free space
-%packages
-@input-methods
-scim*
-iok
-%end
-
-
--- a/fedora-kde-packages.ks
+++ b/fedora-kde-packages.ks
@@ -0,0 +1,29 @@
+%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
+
--- a/fedora-live-astronomy_kde.ks
+++ b/fedora-live-astronomy_kde.ks
@@ -14,8 +14,7 @@
 # Maintainer: Christian Dersch <lupinix@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Lupinix

-%include fedora-live-kde-base.ks
-%include fedora-live-minimization.ks
+%include fedora-live-kde.ks

 # The recommended part size for DVDs is too close to use for the astronomy spin
 part / --size 14500
@@ -25,13 +24,7 @@ part / --size 14500
 # Installing the default/mandatory packages from engineering & scientific
@engineering-and-scientific

-# Basic development
-@development-tools
-@c-development
-
 # astronomical data analysis
-astrometry
-astrometry-tycho2
 cdsclient
 fpack
 gcx
@@ -42,9 +35,8 @@ sextractor
 siril
 skyviewer
 swarp
-wcstools

-# Observatory: KStars + INDI drivers
+# Observatory: KStars + INDI drivers + Skychart
 indi-aagcloudwatcher
 indi-apogee
 indi-eqmod
@@ -52,10 +44,10 @@ indi-gphoto
 indi-sx
 indistarter
 kstars
+stellarium

 # misc. astronomy
 celestia
-stellarium
 virtualplanet

 # Some astro environment stuff
@@ -74,29 +66,17 @@ 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
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -17,9 +17,8 @@ xconfig --startxonboot
 zerombr
 clearpart --all
 part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=sshd
+services --enabled=NetworkManager,ModemManager --disabled=network,sshd
 network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
 shutdown

 %include fedora-repo.ks
@@ -45,13 +44,10 @@ kernel-modules-extra
 # This was added a while ago, I think it falls into the category of
 # "Diagnosis/recovery tool useful from a Live OS image".  Leaving this untouched
 # for now.
-#memtest86+
-@x86-baremetal-tools # memtest86+ is included
+memtest86+

 # The point of a live image is to install
 anaconda
-anaconda-install-env-deps
-anaconda-live
@anaconda-tools

 # Need aajohan-comfortaa-fonts for the SVG rnotes images
@@ -59,14 +55,11 @@ aajohan-comfortaa-fonts

 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
-# syslinux is in @x86-baremetal-tools
+grub2-efi
+syslinux

 # anaconda needs the locales available to run for different locales
 glibc-all-langpacks
-
-# no longer in @core since 2018-10, but needed for livesys script
-initscripts
-chkconfig
 %end

 %post
@@ -101,10 +94,11 @@ livedir="LiveOS"
 for arg in \`cat /proc/cmdline\` ; do
  if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
    livedir=\${arg##rd.live.dir=}
-    continue
+    return
  fi
  if [ "\${arg##live_dir=}" != "\${arg}" ]; then
    livedir=\${arg##live_dir=}
+    return
  fi
 done

@@ -159,6 +153,7 @@ findPersistentHome() {
  for arg in \`cat /proc/cmdline\` ; do
    if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
      homedev=\${arg##persistenthome=}
+      return
    fi
  done
 }
@@ -178,7 +173,7 @@ if [ -n "\$configdone" ]; then
  exit 0
 fi

-# add liveuser user with no passwd
+# add fedora user with no passwd
 action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
 passwd -d liveuser > /dev/null
 usermod -aG wheel liveuser > /dev/null
@@ -211,10 +206,6 @@ systemctl --no-reload disable atd.service 2> /dev/null || :
 systemctl stop crond.service 2> /dev/null || :
 systemctl stop atd.service 2> /dev/null || :

-# turn off abrtd on a live image
-systemctl --no-reload disable abrtd.service 2> /dev/null || :
-systemctl stop abrtd.service 2> /dev/null || :
-
 # Don't sync the system clock when running live (RHBZ #1018162)
 sed -i 's/rtcsync//' /etc/chrony.conf

@@ -223,9 +214,7 @@ touch /.liveimg-configured

 # add static hostname to work around xauth bug
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
-# the hostname must be something else than 'localhost'
-# https://bugzilla.redhat.com/show_bug.cgi?id=1370222
-hostnamectl set-hostname "localhost-live"
+echo "localhost" > /etc/hostname

 EOF

@@ -305,7 +294,7 @@ EOF

 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
@@ -332,14 +321,6 @@ 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


@@ -348,19 +329,7 @@ cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/

 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-    # For livecd-creator builds
-    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-
-    # For lorax/livemedia-creator builds
-    sed -i '
-    /## make boot.iso/ i\
-    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-    <% f = "usr/bin/livecd-iso-to-disk" %>\
-    %if exists(f):\
-        install ${f} ${LIVEDIR}/${f|basename}\
-    %endif\
-    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
 fi
-
 %end
--- a/fedora-live-cinnamon.ks
+++ b/fedora-live-cinnamon.ks
@@ -7,9 +7,10 @@
 # - Dan Book <grinnz@grinnz.com>

 %include fedora-live-base.ks
-%include fedora-cinnamon-common.ks
+%include fedora-live-minimization.ks
+%include fedora-cinnamon-packages.ks

-part / --size=8192
+part / --size=6144

 %post
 # cinnamon configuration
@@ -31,9 +32,6 @@ sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/li
 # set Cinnamon as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf

-# no updater applet in live environment
-rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
-
 # Show harddisk install on the desktop
 sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -1,11 +1,11 @@
 # fedora-design-suite.ks
 # Based on Live Workstation
 # Description:
-# - A collection of applications targeted towards professional visual designers
+# - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
-# Maintainer:
+# Maintainers:
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
-# - Credit to Sebastian Dziallas for initiating the project
+# - Previous maintainer Sebastian Dziallas

 %include fedora-live-workstation.ks

@@ -16,40 +16,58 @@ part / --size 14336
 # Switch to groups for design suite
@design-suite

-# Provides backup application
-deja-dup
-deja-dup-nautilus
+# Added addons to address rhbz#1336879 from dnf
+gimp-data-extras
+gimp-dbp
+gimp-dds
+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

-# Add extra gnome applications
-gnome-books
-gnome-calendar
+# Preview Gnome Photos
 gnome-photos
-gnome-shell-extension-pomodoro
-gnome-todo

-# Add cosmetic for gnome-terminal
-powerline
-powerline-fonts
+# Add gthumb for renaming group files
+gthumb

 # Extra wallpapers
-f31-backgrounds-extras-gnome
+f23-backgrounds-extras-base
+f23-backgrounds-extras-gnome
+f24-backgrounds-extras-base
+f24-backgrounds-extras-gnome

 # removal of unneeded applications
 -gnome-boxes
 -eog
 -rdesktop

-# temporarily removing conflicting application
-mypaint
-sparkleshare
-
 %end

 %post
 #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', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.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
--- a/fedora-live-games.ks
+++ b/fedora-live-games.ks
@@ -1,16 +1,8 @@
-# fedora-live-games.ks
+# fedora-livedvd-games.ks
 #
-# Maintainer:
-# - Darryl T. Agostinelli <dagostinelli@gmail.com>
-#   https://fedoraproject.org/wiki/User:Dagostinelli
-#
-# Former Maintainers:
+# Maintainer(s):
 # - Bruno Wolff III <bruno@wolff.to>
-#   https://fedoraproject.org/wiki/User:Bruno
-#
-# - Rahul Sundaram <sundaram@fedoraproject.org>
-#   https://fedoraproject.org/wiki/User:Sundaram
-#
+# - Formerly maintained by Rahul Sundaram

 %include fedora-live-xfce.ks

@@ -45,6 +37,7 @@ asc-music
 astromenace
 # beneath-a-steel-sky-cd scummvm games cut for size
 boswars
+btanks
 bzflag
 crossfire-client
 extremetuxracer
@@ -55,20 +48,20 @@ freedoom
 freedroidrpg
 frozen-bubble
 gl-117
-# glob2 - currently broken
+glob2
 lincity-ng
 tmw
-#maniadrive - currently broken
-#maniadrive-music - has been retired
+maniadrive
+maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
-neverball
+#neverball #cut for size
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
 # supertux # Crashing
-supertuxkart
+#supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
@@ -96,6 +89,7 @@ kcheckers
 knights
 lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
+londonlaw
 lordsawar
 # lure scummvm games cut for size
 # machineball # Would pull in fluid-soundfont-lite-patches
@@ -105,7 +99,7 @@ pachi
 pioneers
 quarry
 # Ri-li cut for size
-# rogue # recently abandoned. Someone picked it up. Waiting for approval.
+rogue
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures
 solarwolf
@@ -119,6 +113,7 @@ xblast
 auriferous
 alienblaster
 # duel3 # Would pull in fluid-soundfont-lite-patches
+lmarbles
 powermanga
 # raidem # Would pull in fluid-soundfont-lite-patches
 # raidem-music # Would pull in fluid-soundfont-lite-patches
@@ -157,6 +152,7 @@ pingus

 # puzzles (small)

+escape
 # gbrainy Removed for space - only game that pulls in mono
 magicor
 mirrormagic
@@ -175,6 +171,8 @@ PySolFC

 bygfoot
 celestia
+childsplay
+gcompris
 planets
 tuxpaint
 tuxpaint-stamps
@@ -183,13 +181,16 @@ tuxtype2
 # kde based games
 taxipilot

-# compilations (we are avoiding compilations, rare exceptions)
-bsd-games
-
 # utilities

 games-menus

+# Note some stuff I don't want pulled into the games spin.
+
+# No compilations of games as I want to only include games that at least
+# someone thought were good within a genre.
+-kdegames
+
 # Nothing should be downloading data to play.
 -autodownloader

--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -77,7 +77,7 @@ sooperlooper

 #recodring and DAW
 audacity
-ardour5
+ardour4
 rosegarden4
 seq24
 muse
@@ -101,12 +101,14 @@ ladspa-cmt-plugins
 ladspa-fil-plugins
 ladspa-mcp-plugins
 ladspa-rev-plugins
+ladspa-swh-plugins
 ladspa-tap-plugins
 ladspa-vco-plugins

 #lv2 plugins
 lv2
 lv2-avw-plugins
+lv2-fil-plugins
 lv2-invada-plugins
 lv2-kn0ck0ut
 lv2-ll-plugins
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -3,7 +3,7 @@
 # mailto:kde@lists.fedoraproject.org

 %include fedora-live-base.ks
-%include fedora-kde-common.ks
+%include fedora-kde-packages.ks

 %post

@@ -55,9 +55,11 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF

-# Disable plasma-pk-updates (bz #1436873 and 1206760)
-echo "Removing plasma-pk-updates package."
-rpm -e plasma-pk-updates
+# 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 baloo
 cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -9,10 +9,67 @@

 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
-%include fedora-kde-minimization.ks

 # DVD payload
-part / --size=6500
+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
--- a/fedora-live-lxde.ks
+++ b/fedora-live-lxde.ks
@@ -8,7 +8,7 @@

 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-lxde-common.ks
+%include fedora-lxde-packages.ks

 %post
 # LXDE and LXDM configuration
--- a/fedora-live-lxqt.ks
+++ b/fedora-live-lxqt.ks
@@ -1,51 +0,0 @@
-# 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
-
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -4,10 +4,47 @@
 # mailto:desktop@lists.fedoraproject.org

 %include fedora-live-base.ks
-%include fedora-mate-common.ks
+%include fedora-mate-packages.ks
 %include fedora-live-minimization.ks

-part / --size 7168
+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
@@ -21,9 +58,6 @@ 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

@@ -40,9 +74,6 @@ if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
 fi

-# 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/
--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@@ -5,8 +5,14 @@

 # save some space
 -mpage
+-sox
 -hplip
+-numactl
 -isdn4k-utils
+-autofs
+# smartcards won't really work on the livecd.
+-coolkey
+-wget

 # scanning takes quite a bit of space :/
 -xsane
--- a/fedora-live-python-classroom.ks
+++ b/fedora-live-python-classroom.ks
@@ -1,11 +0,0 @@
-# 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-python-classroom-gnome-common.ks
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1695796
-part / --size 7168
--- a/fedora-live-robotics.ks
+++ b/fedora-live-robotics.ks
@@ -27,12 +27,9 @@ mercurial
 -@graphical-internet
 -@games
 -@sound-and-video
-@dial-up
-@input-methods
-@standard

 # Add a web browser
-@firefox
+firefox

 # Remove office suite
 -libreoffice-*
@@ -44,20 +41,18 @@ mercurial
 # Drop things that pull in perl
 -linux-atm

-# No printing or scanning
+# No printing
 -foomatic-db-ppds
 -foomatic
-sane-backends-drivers-scanners
-libsane-hpaio

 # Dictionaries are big
 -aspell-*
+-hunspell-*
 -man-pages*
 -words

 # Help and art can be big, too
 -gnome-user-docs
-gnome-getting-started-docs
 -evolution-help
 -desktop-backgrounds-basic
 -*backgrounds-extras
@@ -66,6 +61,7 @@ mercurial
 -krb5-auth-dialog
 -krb5-workstation
 -pam_krb5
+-quota
 -nano
 -dos2unix
 -finger
@@ -74,8 +70,10 @@ mercurial
 -mtr
 -pinfo
 -rsh
+-nfs-utils
 -ypbind
 -yp-tools
+-rpcbind
 -acpid
 -ntsysv

@@ -118,7 +116,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then

  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'org.qt-project.qtcreator.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'eclipse.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
 FOE

 fi
--- a/fedora-live-scientific_kde.ks
+++ b/fedora-live-scientific_kde.ks
@@ -8,13 +8,169 @@
 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha

-%include fedora-live-kde-base.ks
-%include fedora-live-minimization.ks
-%include fedora-scientific-common.ks
+%include fedora-live-kde.ks

 # The recommended part size for DVDs is too close to use for the scientific spin
 part / --size 14500

+%packages
+
+# Installing the default/mandatory packages from engineering & scientific
+@engineering-and-scientific
+
+# scilab
+scilab
+scilab-devel
+scilab-doc
+
+# Remove sagemath explicitly?
+-sagemath
+
+#Devel tools
+
+#Install the mandatory packages from dev-tools and dev-libs
+# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
+@development-tools
+@development-libs
+@c-development
+@rpm-development-tools
+#others, not included
+# C++ libraries
+blitz-devel
+armadillo-devel
+
+# Misc. related utils
+ddd
+valgrind
+
+#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 3 and tools/libraries not included from the groups
+python3
+python3-tools
+python3-matplotlib
+python3-scipy
+python3-numpy
+python3-ipython
+python3-ipython-console
+python3-ipython-notebook
+python3-sympy
+python3-networkx
+python3-pandas
+
+# matplotlib backends
+python-matplotlib-qt4
+python-matplotlib-tk
+python3-matplotlib-qt4
+python3-matplotlib-tk
+
+# Include Java development tools
+@java-development
+apache-commons-math
+
+#fortran compiler
+gcc-gfortran
+
+# GUI for R
+rkward
+
+# GUI for Octave
+qtoctave
+
+# julia
+julia
+julia-doc
+
+# IDEs for the IDE folks
+@eclipse
+spyder
+
+#writing & publishing
+emacs
+emacs-color-theme
+vim
+scribus
+#scite
+lyx
+kile
+
+#Presentation, Bibliography & Document arrangement 
+#tools
+BibTool
+pdfshuffler
+
+# Parallel/Distributed computing libraries/tools
+openmpi
+openmpi-devel
+valgrind-openmpi
+libgomp
+python-pp
+mpi4py-openmpi
+python3-mpi4py-openmpi
+
+#Version control- a GUI for each as well
+
+# Installing rapidsvn will also install subversion package
+rapidsvn 
+git
+git-gui
+# Mercurial
+mercurial
+mercurial-hgk
+
+#Backup Utilities
+backintime-kde
+
+#needs to install this specifically because of some conflict between openmpi
+#and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
+libotf
+
+#root
+root
+root-gui-fitpanel
+root-python
+
+#Multiple jobs/clustering system
+# torque
+# torque-server
+# torque-scheduler
+# torque-gui
+# torque-libs
+# torque-mom
+# python-pbs
+
+#Drawing, Picture viewing tools, Visualization tools
+dia
+inkscape
+xzgv
+gimp
+ggobi
+ggobi-devel
+#g3data
+#Mayavi
+
+#Misc. Utils
+screen
+tmux
+rlwrap
+hexchat
+shutter
+fig2ps
+bibtex2html
+hevea
+
+#Include Mozilla Firefox
+firefox
+
+%end
+
 %post

 %end
--- a/fedora-live-security.ks
+++ b/fedora-live-security.ks
@@ -36,7 +36,8 @@ gnome-keyring-pam
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
-PackageKit*                # we switched to dnfdragora, so we don't need this
+-realmd                     # only seems to be used in GNOME
+-PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
 -gnumeric
 -foomatic-db-ppds
--- a/fedora-live-soas.ks
+++ b/fedora-live-soas.ks
@@ -5,13 +5,93 @@
 #
 # Maintainers:
 # - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Mel Chua <mchua AT fedoraproject DOT org>

 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-soas-common.ks
+%include fedora-soas-packages.ks
+
+firewall --enabled --service=mdns,presence

 %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
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -3,12 +3,8 @@
 # mailto:desktop@lists.fedoraproject.org

 %include fedora-live-base.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
+%include fedora-workstation-packages.ks
+%include snippets/packagekit-cached-metadata.ks

 part / --size 6656

@@ -17,36 +13,16 @@ part / --size 6656
 cat >> /etc/rc.d/init.d/livesys << EOF


-# disable gnome-software automatically downloading updates
+# disable updates plugin
 cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
 [org.gnome.software]
 download-updates=false
 FOE

-# don't autostart gnome-software session service
-rm -f /etc/xdg/autostart/gnome-software-service.desktop
-
-# disable the gnome-software shell search provider
-cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE
-DefaultDisabled=true
-FOE
-
 # don't run gnome-initial-setup
 mkdir ~liveuser/.config
 touch ~liveuser/.config/gnome-initial-setup-done

-# suppress anaconda spokes redundant with gnome-initial-setup
-cat >> /etc/sysconfig/anaconda << FOE
-[NetworkSpoke]
-visited=1
-
-[PasswordSpoke]
-visited=1
-
-[UserSpoke]
-visited=1
-FOE
-
 # make the installer show up
 if [ -f /usr/share/applications/liveinst.desktop ]; then
  # Show harddisk install in shell dash
--- a/fedora-live-xfce.ks
+++ b/fedora-live-xfce.ks
@@ -11,7 +11,7 @@

 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-xfce-common.ks
+%include fedora-xfce-packages.ks

 %post
 # xfce configuration
@@ -60,9 +60,6 @@ sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.d
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop

-# no updater applet in live environment
-rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
-
 # and mark it as executable (new Xfce security feature)
 chmod +x /home/liveuser/Desktop/liveinst.desktop

--- a/fedora-lxde-packages.ks
+++ b/fedora-lxde-packages.ks
@@ -43,7 +43,8 @@ metacity
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
-PackageKit*                # we switched to dnfdragora, so we don't need this
+-realmd                     # only seems to be used in GNOME
+-PackageKit*                # we switched to yumex, so we don't need this
 -foomatic-db-ppds
 -foomatic
 -stix-fonts
--- a/fedora-lxqt-common.ks
+++ b/fedora-lxqt-common.ks
@@ -1,57 +0,0 @@
-# fedora-lxqt-common.ks
-#
-# Description:
-# – Fedora Live Spin with the LXQt desktop environment
-#
-# Maintainer(s):
-# – Christian Dersch <lupinix@fedoraproject.org>
-# – Zamir SUN <zsun@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
-
-# Text Editor
-enki
-
-# 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*
-# Temporary include ibus to workaround RHBZ 1633225
-# -ibus*
-iok
-
-# Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132
-# Why is this not pulled in by anaconda???
-storaged
-
-%end
-
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -1,4 +1,6 @@
 %packages
+-PackageKit*                # we switched to yumex, so we don't need this
+firefox
@mate
 compiz
 compiz-plugins-main
@@ -14,11 +16,27 @@ emerald-themes
 emerald
 fusion-icon
@networkmanager-submodules
+blueman

 # 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
+lightdm-gtk-greeter-settings
+
+# audio video
+parole
+exaile
+PackageKit-gstreamer-plugin
+
 # blacklist applications which breaks mate-desktop
 -audacious

@@ -28,27 +46,12 @@ mate-disk-usage-analyzer
 # 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

-# Drop things for size
-@3d-printing
-brasero
-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
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@@ -1,23 +0,0 @@
-%packages
-@standard
-initial-setup-gui
-generic-release*
-glibc-all-langpacks
-# recommended by iproute, we don't want it in minimal
-iproute-tc
-# recommended by gnutls, we don't want it in minimal
-trousers
-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
--- a/fedora-modular-arm-server.ks
+++ b/fedora-modular-arm-server.ks
@@ -1,27 +0,0 @@
-%include fedora-arm-base.ks
-
-# server defaults to xfs for / so lets do so on arm also
-part / --size=2500 --fstype xfs
-
-%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*
-fedora-modular-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
-
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@@ -1,79 +0,0 @@
-text
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-# Disabled for modular compose (for now)
-#firewall --enabled --service=mdns
-# Disabled for modular compose (for now)
-#services --enabled=sshd,NetworkManager,chronyd,initial-setup
-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
-autopart --type=plain
-
-# make sure that initial-setup runs and lets us do all the configuration bits
-firstboot --reconfig
-
-%include fedora-repo.ks
-
-%packages --excludedocs --excludeWeakdeps --nocore
-bash
-fedora-modular-release
-filesystem
-coreutils-single
-util-linux
-rpm
-shadow-utils
-microdnf
-glibc-minimal-langpack
-grubby
-kernel
-libcrypt
-sssd-client
-dhcp-client
-fedora-logos
-coreutils
-dosfstools
-e2fsprogs
-fuse-libs
-gnupg2-smime
-libss # used by e2fsprogs
-libusbx
-pinentry
-shared-mime-info
-trousers
-xkeyboard-config
-dracut
-%end
-
-%post
-
-# Setup Raspberry Pi firmware
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-
-releasever=$(rpm --eval '%{fedora}')
-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
-
-# 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
--- a/fedora-python-classroom-common.ks
+++ b/fedora-python-classroom-common.ks
@@ -1,26 +0,0 @@
-# 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
-python2
-python26
-python27
-python33
-python34
-python35
-python36
-python38
-pypy
-
-%end
--- a/fedora-python-classroom-gnome-common.ks
+++ b/fedora-python-classroom-gnome-common.ks
@@ -1,102 +0,0 @@
-# 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
-emacs
-python3-matplotlib-tk
-python3-pillow-tk
-
-# Remove extra gnome-y things
-@graphical-internet
-@games
-@sound-and-video
-@multimedia
-dleyna*
-gnome-boxes
-gnome-calendar
-gnome-clocks
-gnome-contacts
-gnome-disk-utility
-gnome-documents
-gnome-font-viewer
-gnome-maps
-gnome-photos
-gnome-weather
-grilo-plugins
-cheese
-totem
-totem-nautilus
-
-# This is no longer workstation
-@workstation-product
-
-# 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
-gnome-getting-started-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
--- a/fedora-python-classroom-vagrant.ks
+++ b/fedora-python-classroom-vagrant.ks
@@ -1,8 +0,0 @@
-# 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
--- a/fedora-repo-not-rawhide.ks
+++ b/fedora-repo-not-rawhide.ks
@@ -1,4 +1,4 @@
-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
+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
--- a/fedora-repo-rawhide.ks
+++ b/fedora-repo-rawhide.ks
@@ -1,2 +1,2 @@
-repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
--- a/fedora-repo.ks
+++ b/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
--- a/fedora-scientific-common.ks
+++ b/fedora-scientific-common.ks
@@ -1,149 +0,0 @@
-%packages
-
-# Installing the default/mandatory packages from engineering & scientific
-@engineering-and-scientific
-
-# scilab
-scilab
-scilab-devel
-scilab-doc
-
-# Remove sagemath explicitly?
-sagemath
-
-#Devel tools
-
-#Install the mandatory packages from dev-tools and dev-libs
-# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
-@development-tools
-@development-libs
-@c-development
-@rpm-development-tools
-#others, not included
-# C++ libraries
-blitz-devel
-armadillo-devel
-
-# Misc. related utils
-ddd
-valgrind
-
-
-#python 3 and tools/libraries not included from the groups
-python3
-python3-tools
-python3-matplotlib
-python3-scipy
-python3-numpy
-python3-ipython
-python3-ipython-console
-python3-ipython-notebook
-python3-sympy
-python3-networkx
-python3-pandas
-
-# matplotlib backends
-python3-matplotlib-qt4
-python3-matplotlib-tk
-
-# Include Java development tools
-@java-development
-apache-commons-math
-
-#fortran compiler
-gcc-gfortran
-
-# GUI for R
-rkward
-
-# julia
-julia
-julia-doc
-julia-devel
-
-# IDEs for the IDE folks
-@eclipse
-
-# Workaround for https://pagure.io/releng/issue/7814
-eclipse-linuxtools-vagrant
-
-python3-spyder
-python3-spyder-kernels
-
-
-#writing & publishing
-emacs
-emacs-color-theme
-vim
-scribus
-#scite
-lyx
-kile
-
-#Presentation, Bibliography & Document arrangement 
-#tools
-BibTool
-pdfshuffler
-
-# Parallel/Distributed computing libraries/tools
-openmpi
-openmpi-devel
-valgrind-openmpi
-libgomp
-python3-mpi4py-openmpi
-python3-mpi4py-mpich
-
-#Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
-git
-git-gui
-# Mercurial
-mercurial
-mercurial-hgk
-
-#Backup Utilities
-backintime-kde
-
-#needs to install this specifically because of some conflict between openmpi
-#and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
-libotf
-
-#root
-root
-root-gui-fitpanel
-
-#Multiple jobs/clustering system
-# torque
-# torque-server
-# torque-scheduler
-# torque-gui
-# torque-libs
-# torque-mom
-# python-pbs
-
-#Drawing, Picture viewing tools, Visualization tools
-dia
-inkscape
-xzgv
-gimp
-ggobi
-ggobi-devel
-#g3data
-#Mayavi
-
-#Misc. Utils
-screen
-tmux
-rlwrap
-hexchat
-shutter
-fig2ps
-bibtex2html
-hevea
-
-#Include Mozilla Firefox
-firefox
-
-%end
--- a/fedora-scientific-vagrant.ks
+++ b/fedora-scientific-vagrant.ks
@@ -1,12 +0,0 @@
-# Fedora Scientific  Vagrant box
-
-# Fedora Scientific: For researchers in Science and Engineering
-# Fedora-Scientific aims to create a Fedora which has the generic
-# toolset for the researcher
-# Web: https://labs.fedoraproject.org/en/scientific/
-
-# Maintainer: Amit Saha <amitksaha@fedoraproject.org>
-#             https://fedoraproject.org/wiki/User:Amitksaha
-
-%include fedora-cloud-base-vagrant.ks
-%include fedora-scientific-common.ks
--- a/fedora-soas-common.ks
+++ b/fedora-soas-common.ks
@@ -1,167 +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>
-
-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
-
-# 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
-
-# Useful for SoaS duplication from:
-# http://bugs.sugarlabs.org/ticket/74
-livecd-tools
-
-# Get the Sugar boot screen
-plymouth-system-theme
-plymouth-theme-charge
-sugar-logos
-
-%end
-
-%post
-
-# 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
-
-# Rebuild initrd for Sugar boot screen
-KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-/usr/sbin/plymouth-set-default-theme sugar
-dracut -N -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*
-
-# 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
-
-%end
--- a/fedora-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -0,0 +1,86 @@
+# 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
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -8,7 +8,6 @@
 # Make sure to sync any additions / removals done here with
 # workstation-product-environment in comps
@base-x
-@container-management
@core
@firefox
@fonts
@@ -21,6 +20,9 @@
@printing
@workstation-product

+# Branding for the installer
+fedora-productimg-workstation
+
 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
 -reiserfs-utils
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -27,8 +27,10 @@ gnome-keyring-pam
 # Note that blank is still default.
 xscreensaver-extras
 wget
+# Handy for debugging
+rfkill
 # Better more popular browser
-#firefox
+firefox
 system-config-printer

 # save some space
@@ -36,6 +38,8 @@ 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

--- a/l10n/fedora-live-workstation-de_CH.ks
+++ b/l10n/fedora-live-workstation-de_CH.ks
@@ -11,7 +11,7 @@ timezone Europe/Zurich

 %packages
 -gnome-blog
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-de_DE.ks
+++ b/l10n/fedora-live-workstation-de_DE.ks
@@ -11,7 +11,7 @@ timezone Europe/Berlin

 %packages
 -gnome-blog
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-fr_FR.ks
+++ b/l10n/fedora-live-workstation-fr_FR.ks
@@ -13,7 +13,7 @@ keyboard fr-latin9
 timezone Europe/Paris

 %packages
-langpacks-fr
+@french-support
 # exclude input methods:
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-ja_JP.ks
+++ b/l10n/fedora-live-workstation-ja_JP.ks
@@ -1,40 +0,0 @@
-# fedora-live-workstation-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the Gnome Desktop Environment
-#
-# Maintainer(s):
-# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
-
-%include ../fedora-live-workstation.ks
-
-lang ja_JP.UTF-8
-keyboard jp
-timezone Asia/Tokyo
-
-%packages
-langpacks-ja
-# exclude input methods except ibus:
-m17n*
-scim*
-iok
-# ibus stuff
-ibus-kkc
-imsettings
-%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
-
-gsettings set org.gnome.desktop.input-sources sources "[('ibus', 'kkc'), ('xkb', 'jp')]"
-
-%end
--- a/l10n/fedora-live-workstation-nl_NL.ks
+++ b/l10n/fedora-live-workstation-nl_NL.ks
@@ -10,7 +10,7 @@ keyboard us
 timezone Europe/Amsterdam

 %packages
-langpacks-nl
+@dutch-support
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-pt_BR.ks
+++ b/l10n/fedora-live-workstation-pt_BR.ks
@@ -10,7 +10,7 @@ keyboard br-abnt2
 timezone America/Sao_Paulo

 %packages
-langpacks-pt_BR
+@brazilian-support
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-pt_PT.ks
+++ b/l10n/fedora-live-workstation-pt_PT.ks
@@ -10,7 +10,7 @@ keyboard pt-latin1
 timezone Europe/Lisbon

 %packages
-langpacks-pt
+@portuguese-support
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-ru_RU.ks
+++ b/l10n/fedora-live-workstation-ru_RU.ks
@@ -10,7 +10,7 @@ keyboard ru
 timezone Europe/Moscow

 %packages
-langpacks-ru
+@russian-support
 hunspell-ru

 # exclude input methods
--- a/l10n/fedora-livecd-cinnamon-de_DE.ks
+++ b/l10n/fedora-livecd-cinnamon-de_DE.ks
@@ -1,20 +0,0 @@
-# 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
-langpacks-de
-# exclude input methods
-m17n*
-scim*
-%end
--- a/l10n/fedora-livecd-cinnamon-ja_JP.ks
+++ b/l10n/fedora-livecd-cinnamon-ja_JP.ks
@@ -1,35 +0,0 @@
-# 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
-langpacks-ja
-# 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
-
--- a/l10n/fedora-livecd-kde-de_CH.ks
+++ b/l10n/fedora-livecd-kde-de_CH.ks
@@ -10,7 +10,7 @@ keyboard sg-latin1-nodeadkeys
 timezone Europe/Zurich

 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-livecd-kde-de_DE.ks
+++ b/l10n/fedora-livecd-kde-de_DE.ks
@@ -10,7 +10,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin

 %packages
-langpacks-de
+@german-support

 # don't install unnecessary input methods
 -scim*
--- a/l10n/fedora-livecd-kde-fr_FR.ks
+++ b/l10n/fedora-livecd-kde-fr_FR.ks
@@ -13,7 +13,7 @@ keyboard fr-latin9
 timezone Europe/Paris

 %packages
-langpacks-fr
+@french-support
 # exclude input methods:
 -m17n*
 -scim*
--- a/l10n/fedora-livecd-kde-ja_JP.ks
+++ b/l10n/fedora-livecd-kde-ja_JP.ks
@@ -1,40 +0,0 @@
-# fedora-livecd-kde-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the KDE Desktop Environment
-#
-# Maintainer(s):
-# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
-
-%include ../fedora-live-kde.ks
-
-lang ja_JP.UTF-8
-keyboard jp
-timezone Asia/Tokyo
-
-%packages
-langpacks-ja
-# exclude input methods except ibus:
-m17n*
-scim*
-iok
-# ibus-stuff 
-fcitx-qt5
-ibus-kkc
-ibus-mozc
-ibus-qt
-kcm-fcitx
-%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
--- a/l10n/fedora-livecd-kde-nl_NL.ks
+++ b/l10n/fedora-livecd-kde-nl_NL.ks
@@ -10,7 +10,7 @@ keyboard us
 timezone Europe/Amsterdam

 %packages
-langpacks-nl
+@dutch-support
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-livecd-kde-pt_PT.ks
+++ b/l10n/fedora-livecd-kde-pt_PT.ks
@@ -10,7 +10,7 @@ keyboard pt-latin1
 timezone Europe/Lisbon

 %packages
-langpacks-pt
+@portuguese-support
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-livecd-kde-ru_RU.ks
+++ b/l10n/fedora-livecd-kde-ru_RU.ks
@@ -10,7 +10,7 @@ keyboard ru
 timezone Europe/Moscow

 %packages
-langpacks-ru
+@russian-support
 hunspell-ru

 # exclude input methods
--- a/l10n/fedora-livecd-lxde-de_CH.ks
+++ b/l10n/fedora-livecd-lxde-de_CH.ks
@@ -13,7 +13,7 @@ keyboard sg-latin1-nodeadkeys
 timezone Europe/Zurich

 %packages
-langpacks-de
+@german-support

 # exclude input methods
 -ibus*
--- a/l10n/fedora-livecd-lxde-de_DE.ks
+++ b/l10n/fedora-livecd-lxde-de_DE.ks
@@ -13,7 +13,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin

 %packages
-langpacks-de
+@german-support

 # exclude input methods
 -ibus*
--- a/l10n/fedora-livecd-lxde-fr_FR.ks
+++ b/l10n/fedora-livecd-lxde-fr_FR.ks
@@ -13,7 +13,7 @@ keyboard fr-latin9
 timezone Europe/Paris

 %packages
-langpacks-fr
+@french-support
 # exclude input methods:
 -m17n*
 -scim*
--- a/Show More
+++ b/Show More