atomic: re-enable ostree commit gpg checking

In d57f0a2 we managed to lose enablement of gpg signature checking
in Fedora Atomic Host. Re-enable it now.

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 #
 

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"
+

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}

fedora-aos.ks

@@ -0,0 +1,102 @@
+# 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
+
+# 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
+
+# Enable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network on
+
+%end
+

fedora-arm-base.ks

@@ -4,15 +4,18 @@ 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/fw --size=30 --fstype vfat --asprimary
 part /boot --size=512 --fstype ext4 --asprimary
+part swap --size=512 --fstype swap --asprimary
+part / --size=2800 --fstype ext4 --asprimary
 
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 
-services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-swap
+services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
 
 %include fedora-repo.ks
 
@@ -20,7 +23,6 @@ services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-s
 @core
 @standard
 @hardware-support
-zram
 
 kernel
 # remove this in %post
@@ -37,24 +39,31 @@ initial-setup
 initial-setup-gui
 -iwl*
 -ipw*
+-trousers-lib
 -usb_modeswitch
+-iproute-tc
 #lets resize / on first boot
 # dracut-modules-growroot
 
 # make sure all the locales are available for inital0-setup and anaconda to work
 glibc-all-langpacks
 
-# this ks uses it in %post, and imgcreate also uses it in the installed
-# system root, so it needs to be there
-chkconfig
-
+# workaround for consequence of RHBZ #1324623: without this, with
+# yum-based creation tools, compose fails due to conflict between
+# libcrypt and libcrypt-nss. dnf does not seem to have the same
+# issue, so this may be dropped when appliance-creator is ported
+# to dnf.
+libcrypt-nss
+-libcrypt
 %end
 
 %post
 
 # Setup Raspberry Pi firmware
-cp -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
+cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
+sed -i '/vfat/ d' /etc/fstab
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*

fedora-arm-kde.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-common.ks
 
-part / --size=6300 --fstype ext4
+part / --size=5690 --fstype ext4
 
 %post
 

fedora-arm-lxde.ks

@@ -2,8 +2,6 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxde-common.ks
 
-part / --size=4000 --fstype ext4
-
 %post
 
 %end

fedora-arm-lxqt.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxqt-common.ks
 
-part / --size=4400 --fstype ext4 --asprimary
+part / --size=3800 --fstype ext4 --asprimary
 
 %packages
 # trojita not available on non-x86 platforms

fedora-arm-mate.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-mate-common.ks
 
-part / --size=7168 --fstype ext4
+part / --size=5500 --fstype ext4
 
 %post
 

fedora-arm-minimal.ks

@@ -1,7 +1,9 @@
 %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=1250 --fstype ext4
 
 %packages
 -xkeyboard-config

fedora-arm-server.ks

@@ -4,13 +4,10 @@
 part / --size=2500 --fstype xfs
 
 %packages
-# install the default groups for the server environment since installing the environment is not working
+# 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

fedora-arm-workstation.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-workstation-common.ks
 
-part / --size=6200 --fstype ext4
+part / --size=5500 --fstype ext4
 
 %packages
 -initial-setup

fedora-arm-xbase.ks

@@ -4,7 +4,6 @@
 @input-methods
 @multimedia
 @printing
-epiphany
 %end
 
 %post

fedora-arm-xfce.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-xfce-common.ks
 
-part / --size=4700 --fstype ext4
+part / --size=4000 --fstype ext4
 
 %post
 

fedora-atomic-vagrant.ks

@@ -0,0 +1,37 @@
+# Like the Atomic Host cloud image, but tuned for vagrant: enable the
+# vagrant user, disable cloud-init.
+
+%include fedora-atomic.ks
+
+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
+
+# The inherited cloud %post locks the passwd, but we want it
+# unlocked for vagrant, just like downstream.
+passwd -u root
+
+# Vagrant setup
+sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
+echo 'vagrant ALL=(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
+

fedora-atomic.ks

@@ -0,0 +1,152 @@
+# 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 # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+lang en_US.UTF-8
+keyboard us
+timezone --utc Etc/UTC
+
+auth --useshadow --passalgo=sha512
+selinux --enforcing
+rootpw --lock --iscrypted locked
+
+firewall --disabled
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0"
+
+network --bootproto=dhcp --device=link --activate --onboot=on
+services --enabled=sshd,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; note this uses the Bodhi ref, which we reset below
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/atomic/26/ --ref=fedora/26/x86_64/updates/atomic-host
+
+reboot
+
+%post --erroronfail
+# 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-atomic https://kojipkgs.fedoraproject.org/atomic/26/ fedora/26/x86_64/atomic-host
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs fedora-atomic:fedora/26/x86_64/updates/atomic-host --create fedora-atomic:fedora/26/x86_64/atomic-host
+
+# Remove the old ref so that the commit eventually gets
+# cleaned up.
+ostree refs fedora-atomic:fedora/26/x86_64/updates/atomic-host --delete
+
+# delete/add the remote with new options to enable gpg verification
+ostree remote delete fedora-atomic
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-26-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/26/'
+
+# older versions of livecd-tools do not follow "rootpw --lock" line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
+# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
+cp /etc/skel/.bash* /var/roothome
+
+# Configure docker-storage-setup to resize the partition table on boot
+# https://github.com/projectatomic/docker-storage-setup/pull/25
+echo 'GROWPART=true' >> /etc/sysconfig/docker-storage-setup
+
+echo -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/systemd/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.)"
+
+# For trac ticket https://pagure.io/atomic-wg/issue/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
+
+echo "Adding Developer Mode GRUB2 menu item."
+/usr/libexec/atomic-devmode/bootentry add
+
+# Disable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
+
+# Anaconda is writing an /etc/resolv.conf from the install environment.
+# The system should start out with an empty file, otherwise cloud-init
+# will try to use this information and may error:
+# https://bugs.launchpad.net/cloud-init/+bug/1670052
+truncate -s 0 /etc/resolv.conf
+
+%end

fedora-cinnamon-common.ks

@@ -11,9 +11,17 @@
 @networkmanager-submodules
 @cinnamon-desktop
 @libreoffice
-parole
+
+# internet and multimedia
+pidgin
+hexchat
+transmission
+
+# mp3 support
+gstreamer1-plugins-ugly-free
 
 # extra backgrounds
-f30-backgrounds-extras-gnome
+desktop-backgrounds-basic
+f26-backgrounds-extras-gnome
 
 %end

fedora-cloud-base-vagrant.ks

@@ -32,8 +32,6 @@ dnf-yum
 # users setup. This can actually take a bit of time.  Just fold it
 # in to the base box disk image
 rsync
-# Add in sshfs for vagrant-sshfs plugin
-fuse-sshfs
 %end
 
 %post --erroronfail

fedora-cloud-base.ks

@@ -13,12 +13,12 @@
 # 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
@@ -35,8 +35,7 @@ rootpw --lock --iscrypted locked
 
 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"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -75,6 +74,7 @@ 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
@@ -137,7 +137,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
@@ -170,6 +170,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"
@@ -240,12 +245,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*
+# For trac ticket https://fedorahosted.org/cloud/ticket/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
 
 # Enable network service here, as doing it in the services line
 # fails due to RHBZ #1369794

fedora-cloud-bigdata.ks

@@ -112,12 +112,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
@@ -176,10 +176,10 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/systemd/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 -q --qf '%{version}\n' fedora-release)
@@ -204,7 +204,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
 /usr/sbin/fixfiles -R -a restore
 
 echo "Zeroing out empty space."

fedora-cloud-experimental.ks

@@ -103,12 +103,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
@@ -167,10 +167,10 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/systemd/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 -q --qf '%{version}\n' fedora-release)
@@ -196,7 +196,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

fedora-disk-base.ks

@@ -14,12 +14,12 @@ timezone US/Eastern
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
-services --enabled=sshd,NetworkManager,chronyd,zram-swap
+services --enabled=sshd,NetworkManager,chronyd
 network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
 
-bootloader --timeout=1
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 zerombr
 clearpart --all --initlabel --disklabel=msdos
@@ -33,7 +33,6 @@ firstboot --reconfig
 @core
 @standard
 @hardware-support
-zram
 
 kernel
 # remove this in %post
@@ -46,20 +45,30 @@ rng-tools
 chrony
 bcm283x-firmware
 initial-setup
-# Intel wireless firmware assumed never of use for disk images
 -iwl*
 -ipw*
+-trousers-lib
 -usb_modeswitch
+-iproute-tc
 -generic-release*
 
 # make sure all the locales are available for inital0-setup and anaconda to work
 glibc-all-langpacks
 
+# workaround for consequence of RHBZ #1324623: without this, with
+# yum-based creation tools, compose fails due to conflict between
+# libcrypt and libcrypt-nss. dnf does not seem to have the same
+# issue, so this may be dropped when appliance-creator is ported
+# to dnf.
+libcrypt-nss
+-libcrypt
 %end
 
 %post
 
 # Setup Raspberry Pi firmware
+cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
+mv -f /boot/efi/config-64.txt /boot/efi/config.txt
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
@@ -72,9 +81,6 @@ 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

fedora-disk-minimal.ks

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

fedora-disk-server.ks

@@ -1,22 +1,16 @@
 %include fedora-disk-base.ks
 
-services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap
+services --enabled=sshd,NetworkManager,chronyd,initial-setup
 
-autopart --noswap
+autopart
 
 %packages
-# install the default groups for the server environment since installing the environment is not working
+# install the default groups for the server evironment 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

fedora-disk-workstation.ks

@@ -4,9 +4,9 @@
 
 bootloader --append="cma=256MB"
 
-services --enabled=sshd,NetworkManager,chronyd,zram-swap
+services --enabled=sshd,NetworkManager,chronyd
 
-autopart --type=plain --noswap
+autopart --type=plain
 
 %packages
 -initial-setup

fedora-docker-base-minimal.ks

@@ -1,8 +1,8 @@
-# See fedora-container-common.ks for details on how to hack on container image kickstarts
+# See docker-base-common.ks for details on how to hack on docker image kickstarts
 # This base is a stripped back Fedora image without python3/dnf.
 # If you need that use the standard base image.
 
-%include fedora-container-common.ks
+%include fedora-docker-common.ks
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 microdnf

fedora-docker-base.ks

@@ -1,21 +1,20 @@
-# See fedora-container-common.ks for details on how to hack on container image kickstarts
+# See docker-base-common.ks for details on how to hack on docker image kickstarts
 # This base is a standard Fedora image with python3 and dnf
 
-%include fedora-container-common.ks
+%include fedora-docker-common.ks
 
 %packages --excludedocs --instLangs=en --nocore
 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
+
 %end
 
 %post --erroronfail --log=/root/anaconda-post.log
+
 # remove some extraneous files
 rm -rf /var/cache/dnf/*
 rm -rf /tmp/*
@@ -23,9 +22,6 @@ 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
 

fedora-docker-common.ks

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

fedora-iot.ks

@@ -1,117 +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
-
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-rootpw --lock --iscrypted locked
-
-# Add most common consoles console=ttyAMA0 console=ttyS0 console=ttyS1 as kernel boot parameter
-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/devel/${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/fw/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/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/devel/${arch}/iot"
-
-# Make sure the ref we're supposedly sitting on (according
-# to the updated origin) exists.
-ostree refs "fedora-iot:fedora/devel/${arch}/iot" --create "fedora-iot:fedora/devel/${arch}/iot"
-
-# Remove the old ref so that the commit eventually gets cleaned up.
-ostree refs "fedora-iot:fedora/devel/${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/RPM-GPG-KEY-fedora-iot-2019 --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
-
-# We're gettin 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
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# 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
-
-echo "Adding Developer Mode GRUB2 menu item."
-/usr/libexec/atomic-devmode/bootentry add
-
-# Anaconda is writing an /etc/resolv.conf from the install environment.
-# The system should start out with an empty file, otherwise cloud-init
-# will try to use this information and may error:
-# https://bugs.launchpad.net/cloud-init/+bug/1670052
-truncate -s 0 /etc/resolv.conf
-
-%end

fedora-kde-common.ks

@@ -1,16 +1,16 @@
-
 %packages
 @firefox
 @kde-apps
 @kde-desktop
 @kde-media
 @kde-office
+@kde-telepathy
 @networkmanager-submodules
 
 ### The KDE-Desktop
 
 ### Browser
-falkon
+qupzilla
 
 ### fixes
 
@@ -18,7 +18,7 @@ falkon
 -system-config-printer
 # make sure mariadb lands instead of MySQL (hopefully a temporary hack)
 mariadb-embedded
-mariadb-connector-c
+mariadb-libs
 mariadb-server
 
 # minimal localization support - allows installing the kde-l10n-* packages
@@ -42,8 +42,29 @@ k3b				# ~15 megs
 fuse
 mediawriter
 
+# only include kdegames-minimal
+-kdegames
+kdegames-minimal
+
 ### space issues
 
+# fonts (we make no bones about admitting we're english-only)
+wqy-microhei-fonts			# a compact CJK font, to replace:
+-naver-nanum-gothic-fonts		# Korean
+-vlgothic-fonts				# Japanese
+-adobe-source-han-sans-cn-fonts		# simplified Chinese
+-adobe-source-han-sans-tw-fonts 	# traditional Chinese
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
+#-stix-fonts		# mathematical symbols
+
+# remove input methods to free space
+-@input-methods
+-scim*
+-m17n*
+-ibus*
+-iok
+
 # admin-tools
 -gnome-disk-utility
 # kcm_clock still lacks some features, so keep system-config-date around

fedora-kde-minimization.ks

@@ -1,8 +0,0 @@
-# remove input methods to free space
-%packages
--@input-methods
--scim*
--iok
-%end
-
-

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
@@ -44,7 +37,7 @@ skyviewer
 swarp
 wcstools
 
-# Observatory: KStars + INDI drivers
+# Observatory: KStars + INDI drivers + Skychart
 indi-aagcloudwatcher
 indi-apogee
 indi-eqmod
@@ -52,10 +45,10 @@ indi-gphoto
 indi-sx
 indistarter
 kstars
+stellarium
 
 # misc. astronomy
 celestia
-stellarium
 virtualplanet
 
 # Some astro environment stuff

fedora-live-base.ks

@@ -49,8 +49,6 @@ 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
@@ -58,14 +56,11 @@ aajohan-comfortaa-fonts
 
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
+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
@@ -100,10 +95,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
 
@@ -158,6 +154,7 @@ findPersistentHome() {
   for arg in \`cat /proc/cmdline\` ; do
     if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
       homedev=\${arg##persistenthome=}
+      return
     fi
   done
 }
@@ -177,7 +174,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
@@ -210,10 +207,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
 
@@ -347,19 +340,8 @@ 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

fedora-live-cinnamon.ks

@@ -7,9 +7,10 @@
 # - Dan Book <grinnz@grinnz.com>
 
 %include fedora-live-base.ks
+%include fedora-live-minimization.ks
 %include fedora-cinnamon-common.ks
 
-part / --size=8192
+part / --size=6144
 
 %post
 # cinnamon configuration

fedora-live-design_suite.ks

@@ -6,6 +6,7 @@
 # Maintainer:
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Credit to Sebastian Dziallas for initiating the project
+
 %include fedora-live-workstation.ks
 
 # Size partition
@@ -15,39 +16,55 @@ 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-plugin
+gimp-elsamuko
+gimp-fourier-plugin
+gimp-gap
+gimp-help
+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
+inkscape-table
+sane-backends-drivers-scanners
+xsane-gimp
+#YafaRay-blender
 
 # Add extra gnome applications
+gnome-books
 gnome-calendar
 gnome-photos
-gnome-shell-extension-pomodoro
-gnome-todo
-
-# Add cosmetic for gnome-terminal
-powerline
-powerline-fonts
 
 # Extra wallpapers
-f30-backgrounds-extras-gnome
+f26-backgrounds-extras-base
+f26-backgrounds-extras-gnome
+
 
 # removal of unneeded applications
 -gnome-boxes
 -eog
 -rdesktop
 
-# temporarily removing conflicting application
--synfigstudio
--mypaint
-
 %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', 'gimp.desktop', 'darktable.desktop','krita', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
 FOE
 
 # Add link to lists of tutorials

fedora-live-games.ks

@@ -1,8 +1,7 @@
 # fedora-livedvd-games.ks
 #
 # Maintainer(s):
-# - Darryl T. Agostinelli <dagostinelli@gmail.com>
-# - Formerly maintained by Bruno Wolff III <bruno@wolff.to>
+# - Bruno Wolff III <bruno@wolff.to>
 # - Formerly maintained by Rahul Sundaram
 
 %include fedora-live-xfce.ks
@@ -46,10 +45,10 @@ extremetuxracer
 freeciv
 freecol
 freedoom
-# freedroidrpg # Cut for size
+freedroidrpg
 frozen-bubble
 gl-117
-# glob2 - currently broken
+glob2
 lincity-ng
 tmw
 #maniadrive - currently broken
@@ -67,8 +66,8 @@ ultimatestunts
 warzone2100
 wesnoth
 # worminator # Would pull in fluid-soundfont-lite-patches
-# warmux # Cut for size
-# xmoto # Cut for size
+warmux
+xmoto
 
 # traditional (small)
 
@@ -100,7 +99,7 @@ pachi
 pioneers
 quarry
 # Ri-li cut for size
-# rogue # abandoned. Someone pick it up so we can include it again!
+rogue
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures
 solarwolf
@@ -182,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
 

fedora-live-jam_kde.ks

@@ -77,7 +77,7 @@ sooperlooper
 
 #recodring and DAW
 audacity
-ardour5
+ardour4
 rosegarden4
 seq24
 muse

fedora-live-kde.ks

@@ -9,10 +9,9 @@
 
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
-%include fedora-kde-minimization.ks
 
 # DVD payload
-part / --size=6500
+part / --size=6144
 
 %post
 %end

fedora-live-mate_compiz.ks

@@ -7,7 +7,7 @@
 %include fedora-mate-common.ks
 %include fedora-live-minimization.ks
 
-part / --size 7168
+part / --size 6144
 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF

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

fedora-live-python-classroom.ks

@@ -5,7 +5,5 @@
 # The Workstion based Python Classroom Lab
 
 %include fedora-live-workstation.ks
+%include fedora-live-minimization.ks
 %include fedora-python-classroom-gnome-common.ks
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1695796
-part / --size 7168

fedora-live-robotics.ks

@@ -47,6 +47,7 @@ firefox
 
 # Dictionaries are big
 -aspell-*
+-hunspell-*
 -man-pages*
 -words
 

fedora-live-scientific_kde.ks

@@ -8,13 +8,168 @@
 # 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
+python2-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
+
+#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

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

fedora-live-soas.ks

@@ -5,6 +5,8 @@
 #
 # 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

fedora-live-workstation.ks

@@ -17,36 +17,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

fedora-live-xfce.ks

@@ -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
 

fedora-lxde-common.ks

@@ -43,7 +43,7 @@ metacity
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
--PackageKit*                # we switched to dnfdragora, so we don't need this
+-PackageKit*                # we switched to yumex, so we don't need this
 -foomatic-db-ppds
 -foomatic
 -stix-fonts

fedora-lxqt-common.ks

@@ -5,7 +5,6 @@
 #
 # Maintainer(s):
 # – Christian Dersch <lupinix@fedoraproject.org>
-# – Zamir SUN <zsun@fedoraproject.org>
 #
 
 %packages
@@ -19,7 +18,7 @@ gnome-keyring
 
 
 # l10n
-@lxqt-l10n
+lxqt-l10n
 lximage-qt-l10n
 obconf-qt-l10n
 pavucontrol-qt-l10n
@@ -27,9 +26,6 @@ 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:
@@ -45,8 +41,7 @@ wqy-microhei-fonts          # a compact CJK font, to replace:
 -@input-methods
 -scim*
 -m17n*
-# Temporary include ibus to workaround RHBZ 1633225
-# -ibus*
+-ibus*
 -iok
 
 # Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132

fedora-mate-common.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,22 @@ emerald-themes
 emerald
 fusion-icon
 @networkmanager-submodules
+blueberry
 
 # some apps from mate-applications
 caja-actions
 mate-disk-usage-analyzer
 
+# system tools
+system-config-printer
+system-config-printer-applet
+lightdm-gtk-greeter-settings
+
+# audio video
+parole
+exaile
+gstreamer1-plugins-ugly-free # mp3 support
+
 # blacklist applications which breaks mate-desktop
 -audacious
 
@@ -28,6 +41,10 @@ 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
@@ -35,6 +52,7 @@ nss-mdns
 # Drop things for size
 -@3d-printing
 -brasero
+-colord
 -fedora-icon-theme
 -gnome-icon-theme
 -gnome-icon-theme-symbolic

fedora-minimal-common.ks

@@ -3,10 +3,6 @@
 -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

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
-

fedora-modular-disk-minimal.ks

@@ -56,6 +56,8 @@ dhcp-client
 %post
 
 # Setup Raspberry Pi firmware
+#cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
+mv -f /boot/efi/config-64.txt /boot/efi/config.txt
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
 releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)

fedora-modular-docker-base-minimal.ks

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

fedora-modular-docker-common.ks

@@ -1,4 +1,4 @@
-# This is the common bits between Fedora Container base image.
+# This is the common bits between Docker base images based on Modular Fedora.
 #
 # To keep this image minimal it only installs English language. You need to change
 # dnf configuration in order to enable other languages.
@@ -12,8 +12,8 @@
 #
 # 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
+#   ksflatten -c fedora-modular-base[-minimal].ks -o fedora-modular-base-test.ks
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-modular-base-test.ks modular
 #
 
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
@@ -30,9 +30,9 @@ clearpart --all
 autopart --noboot --nohome --noswap --nolvm
 
 %packages --excludedocs --instLangs=en --nocore
-fedora-release-container
+fedora-modular-release
 bash
-coreutils
+coreutils-single
 glibc-minimal-langpack
 libcrypt
 rpm
@@ -45,11 +45,11 @@ util-linux
 -fuse-libs
 -gnupg2-smime
 -libss # used by e2fsprogs
+-libusbx
 -pinentry
 -shared-mime-info
 -trousers
 -xkeyboard-config
--grubby
 
 %end
 
@@ -63,7 +63,7 @@ echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1400682
 echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release-container)
+releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 
 echo "# fstab intentionally empty for containers" > /etc/fstab

fedora-python-classroom-common.ks

@@ -17,8 +17,6 @@ wget
 -python33
 -python34
 -python35
--python36
--python38
 -pypy
 
 %end

fedora-python-classroom-gnome-common.ks

@@ -18,6 +18,7 @@ python3-pillow-tk
 -@sound-and-video
 -@multimedia
 -dleyna*
+-evolution*
 -gnome-boxes
 -gnome-calendar
 -gnome-clocks
@@ -26,7 +27,6 @@ python3-pillow-tk
 -gnome-documents
 -gnome-font-viewer
 -gnome-maps
--gnome-photos
 -gnome-weather
 -grilo-plugins
 -cheese
@@ -35,6 +35,7 @@ python3-pillow-tk
 
 # This is no longer workstation
 -@workstation-product
+-fedora-productimg-workstation
 
 # Add a web browser
 @firefox
@@ -59,7 +60,6 @@ python3-pillow-tk
 
 # Help and art can be big, too
 -gnome-user-docs
--gnome-getting-started-docs
 -desktop-backgrounds-basic
 -*backgrounds-extras
 

fedora-scientific-common.ks

@@ -1,151 +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
-
-# GUI for Octave
-#qtoctave
-
-# julia
-# Comment out till build failure is sorted
-# julia
-# julia-doc
-
-# IDEs for the IDE folks
-@eclipse
-
-# Workaround for https://pagure.io/releng/issue/7814
--eclipse-linuxtools-vagrant
-
-#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
-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

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

fedora-soas-common.ks

@@ -30,7 +30,8 @@ firewall --enabled --service=mdns,presence
 -abrt-cli
 -ibus*
 -hyperv-daemons
--webkit2gtk3-plugin-process-gtk2
+-webkitgtk4-plugin-process-gtk2
+webkitgtk3
 
 # Add some extra fonts
 dejavu-sans-fonts
@@ -76,10 +77,6 @@ pulseaudio-utils
 # 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
@@ -92,7 +89,7 @@ sugar-logos
 # Rebuild initrd for Sugar boot screen
 KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
 /usr/sbin/plymouth-set-default-theme sugar
-dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+/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*
@@ -163,6 +160,6 @@ show-logout=false
 [org.sugarlabs.power]
 automatic=true
 EOF
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
 
 %end

fedora-workstation-common.ks

@@ -20,6 +20,9 @@
 @printing
 @workstation-product
 
+# Branding for the installer
+fedora-productimg-workstation
+
 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
 -reiserfs-utils

fedora-xfce-common.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,7 @@ system-config-printer
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
+-PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
 -xfce4-sensors-plugin
 

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*

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*

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*

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

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*

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*

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*

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

l10n/fedora-livecd-cinnamon-de_DE.ks

@@ -13,7 +13,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-cinnamon-ja_JP.ks

@@ -13,7 +13,7 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-langpacks-ja
+@japanese-support
 # exclude input methods except ibus:
 -m17n*
 -scim*

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*

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*

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*

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

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*

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*

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

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*

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*

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*

l10n/fedora-livecd-lxde-ja_JP.ks

@@ -13,10 +13,11 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-langpacks-ja
-# exclude input methods except ibus:
+@japanese-support
+# exclude input methods:
 -m17n*
 -scim*
+-ibus*
 -iok
 # Better more popular browser
 firefox

l10n/fedora-livecd-lxde-ru_RU.ks

@@ -13,7 +13,7 @@ keyboard ru
 timezone Europe/Moscow
 
 %packages
-langpacks-ru
+@russian-support
 hunspell-ru
 
 # exclude input methods

l10n/fedora-livecd-xfce-de_CH.ks

@@ -10,7 +10,7 @@ keyboard sg-latin1-nodeadkeys
 timezone Europe/Zurich
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-de_DE.ks

@@ -10,7 +10,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-fr_FR.ks

@@ -13,7 +13,7 @@ keyboard fr-latin9
 timezone Europe/Paris
 
 %packages
-langpacks-fr
+@french-support
 # exclude input methods:
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-ja_JP.ks

@@ -13,7 +13,7 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-langpacks-ja
+@japanese-support
 # exclude input methods except ibus:
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-nl_NL.ks

@@ -10,7 +10,7 @@ keyboard us
 timezone Europe/Amsterdam
 
 %packages
-langpacks-nl
+@dutch-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-pt_PT.ks

@@ -10,7 +10,7 @@ keyboard pt-latin1
 timezone Europe/Lisbon
 
 %packages
-langpacks-pt
+@portuguese-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-ru_RU.ks

@@ -10,7 +10,7 @@ keyboard ru
 timezone Europe/Moscow
 
 %packages
-langpacks-ru
+@russian-support
 hunspell-ru
 
 # exclude input methods

l10n/fedora-livedvd-electronic-lab-de_CH.ks

@@ -10,7 +10,7 @@ keyboard sg-latin1
 timezone Europe/Zurich
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-electronic-lab-de_DE.ks

@@ -10,7 +10,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-electronic-lab-nl_NL.ks

@@ -10,7 +10,7 @@ keyboard us
 timezone Europe/Amsterdam
 
 %packages
-langpacks-nl
+@dutch-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-electronic-lab-pt_PT.ks

@@ -10,7 +10,7 @@ keyboard pt-latin1
 timezone Europe/Lisbon
 
 %packages
-langpacks-pt
+@portuguese-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-electronic-lab-ru_RU.ks

@@ -10,7 +10,7 @@ keyboard ru
 timezone Europe/Moscow
 
 %packages
-langpacks-ru
+@russian-support
 hunspell-ru
 
 # exclude input methods

l10n/fedora-livedvd-games-de_CH.ks

@@ -10,7 +10,7 @@ keyboard sg-latin1
 timezone Europe/Zurich
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-games-de_DE.ks

@@ -10,7 +10,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-games-ja_JP.ks

@@ -1,40 +0,0 @@
-# fedora-livedvd-games-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the game Desktop Environment
-# 
-# Maintainer(s):
-# - Mika Tsukada  <mika.tsukada@miraclelinux.com>
-
-%include ../fedora-live-games.ks
-
-lang ja_JP.UTF-8
-keyboard ja
-timezone Asia/Tokyo
-
-%packages
-langpacks-ja
-# exclude input methods except ibus:
--m17n*
--scim*
--iok
-glibc-langpack-ja
-# ibus-stuff
-ibus-kkc
-ibus-mozc
-%end
-
-%post
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-%end
-
-

l10n/fedora-livedvd-games-nl_NL.ks

@@ -10,7 +10,7 @@ keyboard us
 timezone Europe/Amsterdam
 
 %packages
-langpacks-nl
+@dutch-support
 # exclude input methods
 -m17n*
 -scim*