IoT: Update F-30 for stable ostree branch

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>

fedora-arm-base.ks

@@ -6,15 +6,13 @@ firewall --enabled --service=mdns,ssh
 
 bootloader --location=mbr
 
-part /boot/fw --size=30 --fstype vfat --asprimary
+part /boot/efi --size=80 --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,rsyslog,chronyd,initial-setup
+services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-swap
 
 %include fedora-repo.ks
 
@@ -22,6 +20,7 @@ services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setu
 @core
 @standard
 @hardware-support
+zram
 
 kernel
 # remove this in %post
@@ -39,22 +38,23 @@ initial-setup-gui
 -iwl*
 -ipw*
 -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
+
 %end
 
 %post
 
 # Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-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/efi/rpi3-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-lxqt.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxqt-common.ks
 
-part / --size=4200 --fstype ext4 --asprimary
+part / --size=4400 --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=6000 --fstype ext4
+part / --size=7168 --fstype ext4
 
 %post
 

fedora-arm-minimal.ks

@@ -1,9 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-minimal-common.ks
 
-part /boot --size=512 --fstype ext4
+part / --size=1400 --fstype ext4
-part swap --size=256 --fstype swap
-part / --size=1256 --fstype ext4
 
 %packages
 -xkeyboard-config

fedora-arm-xbase.ks

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

fedora-atomic-vagrant.ks

@@ -1,37 +0,0 @@
-# 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

@@ -1,157 +0,0 @@
-# Fedora Atomic Host is the Fedora version of the "Atomic Host" pattern
-# from [Project Atomic](http://www.projectatomic.io/).
-
-# This kickstart is used for cloud/virt images, and uses cloud-init
-# to bootstrap authentication, just like Fedora Cloud Base.  (Also note the
-# fedora-atomic-vagrant.ks kickstart inherits from this).
-
-# One very important thing to understand is that this image contains the same
-# OSTree commit as will be used on bare metal installations - Fedora Atomic Host
-# also has an ISO. One difference though is that cloud-init isn't enabled for
-# bare metal. When processing this kickstart then, Anaconda isn't actually
-# installing packages - it's just replicating a "pre-assembled" tree from
-# rpm-ostree.
-
-# Basically, the `ostreesetup` verb replaces the traditional `%packages`
-# section. For example, `rpm-ostree status` can show you the same checksum and
-# version from an ISO install and this cloud image - it's the same bits.
-
-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
-
-# Explicitly disable firewall since cloud providers generally provide
-# higher level firewall constructs (i.e. security groups).
-firewall --disabled
-
-# console=ttyAMA0 and console=hvc0 as kernel boot parameter to see
-# kernel boot messages on serial console as well on aarch64 and
-# ppc64le respectively.
-# https://pagure.io/atomic-wg/issue/347
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 console=ttyAMA0 console=hvc0 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
-# Implement: https://pagure.io/atomic-wg/issue/281
-# The bare metal layout currently inherits from fedora server and is in
-# https://github.com/rhinstaller/anaconda/blob/master/pyanaconda/installclasses/fedora_atomic_host.py
-# However, the disk size is currently just 6GB for the cloud image (defined in pungi-fedora).  So the
-# "15GB, rest unallocated" model doesn't make sense.  The Vagrant box is 40GB (apparently a number of
-# Vagrant boxes come big and rely on thin provisioning).
-# In both cases, it's simplest to just fill all the disk space.
-#
-# Use reqpart to create hardware platform specific partitions
-# https://pagure.io/atomic-wg/issue/299
-reqpart --add-boot
-part pv.01 --grow
-volgroup atomicos pv.01
-# Start from 3GB as we did before, since we just need a size.  But we do --grow to fill all space.
-logvol / --size=3000 --grow --fstype="xfs" --name=root --vgname=atomicos
-
-# Equivalent of %include fedora-repo.ks
-# Pull from the ostree repo that was created during the compose
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/rawhide/${basearch}/atomic-host
-
-reboot
-
-%post --erroronfail
-# See https://github.com/projectatomic/rpm-ostree/issues/42
-# Set the ostree repo to the location we want users to upgrade from
-# This location is where the compose gets synced to after the compose
-# is done.
-ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
-
-# 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
-# and extend the root filesystem to fill it.
-# https://pagure.io/atomic-wg/issue/343
-echo 'GROWPART=true' >> /etc/sysconfig/docker-storage-setup
-echo 'ROOT_SIZE=+100%FREE' >> /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
-
-# 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
-
-# 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
-
-# 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,8 +11,9 @@
 @networkmanager-submodules
 @cinnamon-desktop
 @libreoffice
+parole
 
 # extra backgrounds
-f28-backgrounds-extras-gnome
+f30-backgrounds-extras-gnome
 
 %end

fedora-cloud-base.ks

@@ -15,9 +15,9 @@
 # For a TDL file, I store one here:
 # https://pagure.io/fedora-atomic/raw/master/f/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
 #   tempfile=$(mktemp --suffix=.ks)
 #   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
@@ -75,7 +75,6 @@ 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
@@ -138,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.
-# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+# dnf -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
@@ -241,10 +240,10 @@ 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 
+# When we build the image with oz, dracut is used
-# and sets up a ifcfg-en<whatever> for the device. We don't 
+# 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. 
+# want to use this, we use eth0 so it is always the same.
-# So we remove all these ifcfg-en<whatever> devices so 
+# 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*
 

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."
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+dnf -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."
-yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+dnf -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 yum repodata."
+echo "Cleaning old dnf repodata."
-yum history new
+dnf history new
-yum clean all
+dnf clean all
-truncate -c -s 0 /var/log/yum.log
+truncate -c -s 0 /var/log/dnf.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/yum
+mkdir -p /var/cache/dnf
 /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."
-yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+dnf -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."
-yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+dnf -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 yum repodata."
+echo "Cleaning old dnf repodata."
-yum history new
+dnf history new
-yum clean all
+dnf clean all
-truncate -c -s 0 /var/log/yum.log
+truncate -c -s 0 /var/log/dnf.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/yum
+mkdir -p /var/cache/dnf
 chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys

fedora-container-base-minimal.ks

@@ -1,8 +1,8 @@
-# See docker-base-common.ks for details on how to hack on docker image kickstarts
+# 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-docker-common.ks
+%include fedora-container-common.ks
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 microdnf

fedora-container-base.ks

@@ -1,7 +1,7 @@
-# See docker-base-common.ks for details on how to hack on docker image kickstarts
+# 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-docker-common.ks
+%include fedora-container-common.ks
 
 %packages --excludedocs --instLangs=en --nocore
 rootfiles
@@ -12,7 +12,9 @@ vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sssd-client
-
+sudo
+-glibc-langpack-en
+-cracklib-dicts
 %end
 
 %post --erroronfail --log=/root/anaconda-post.log
@@ -23,6 +25,9 @@ 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
 
@@ -42,3 +47,15 @@ systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
 rm /run/nologin # https://pagure.io/atomic-wg/issue/316
 
 %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

fedora-container-common.ks

@@ -1,4 +1,4 @@
-# This is the common bits between Fedora Docker base image.
+# 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.
@@ -12,8 +12,8 @@
 #
 # Then, once you have imagefactory and imagefactory-plugins installed, run:
 #
-#   ksflatten -c fedora-docker-base[-minimal].ks -o fedora-docker-base-test.ks
+#   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-docker-base-test.ks docker
+#   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
@@ -30,9 +30,9 @@ clearpart --all
 autopart --noboot --nohome --noswap --nolvm
 
 %packages --excludedocs --instLangs=en --nocore
-fedora-release
+fedora-release-container
 bash
-coreutils-single
+coreutils
 glibc-minimal-langpack
 libcrypt
 rpm
@@ -49,6 +49,7 @@ util-linux
 -shared-mime-info
 -trousers
 -xkeyboard-config
+-grubby
 
 %end
 
@@ -60,9 +61,12 @@ set -eux
 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 -q --qf '%{version}\n' fedora-release)
+releasever=$(rpm -q --qf '%{version}\n' fedora-release-container)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 
 echo "# fstab intentionally empty for containers" > /etc/fstab

fedora-disk-base.ks

@@ -14,7 +14,7 @@ timezone US/Eastern
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
-services --enabled=sshd,NetworkManager,chronyd
+services --enabled=sshd,NetworkManager,chronyd,zram-swap
 network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
@@ -33,6 +33,7 @@ firstboot --reconfig
 @core
 @standard
 @hardware-support
+zram
 
 kernel
 # remove this in %post
@@ -45,11 +46,10 @@ 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
@@ -60,8 +60,6 @@ glibc-all-langpacks
 %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)

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
+services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap
 
-autopart --type=plain
+autopart --type=plain --noswap
 
 %packages
 -xkeyboard-config

fedora-disk-server.ks

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

fedora-disk-workstation.ks

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

fedora-iot.ks

@@ -0,0 +1,117 @@
+# 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/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/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/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 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

@@ -5,7 +5,6 @@
 @kde-desktop
 @kde-media
 @kde-office
-@kde-telepathy
 @networkmanager-submodules
 
 ### The KDE-Desktop

fedora-live-base.ks

@@ -50,6 +50,7 @@ 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
@@ -61,6 +62,10 @@ 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
@@ -95,11 +100,10 @@ livedir="LiveOS"
 for arg in \`cat /proc/cmdline\` ; do
   if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
     livedir=\${arg##rd.live.dir=}
-    return
+    continue
   fi
   if [ "\${arg##live_dir=}" != "\${arg}" ]; then
     livedir=\${arg##live_dir=}
-    return
   fi
 done
 
@@ -154,7 +158,6 @@ findPersistentHome() {
   for arg in \`cat /proc/cmdline\` ; do
     if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
       homedev=\${arg##persistenthome=}
-      return
     fi
   done
 }
@@ -344,8 +347,19 @@ 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
-  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    # For livecd-creator builds
-  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+    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
 fi
 
 %end

fedora-live-cinnamon.ks

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

fedora-live-design_suite.ks

@@ -6,7 +6,6 @@
 # Maintainer:
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Credit to Sebastian Dziallas for initiating the project
-
 %include fedora-live-workstation.ks
 
 # Size partition
@@ -17,11 +16,10 @@ part / --size 14336
 @design-suite
 
 # Provides backup application
-deja-dup
+#deja-dup
-deja-dup-nautilus
+#deja-dup-nautilus
 
 # Add extra gnome applications
-gnome-books
 gnome-calendar
 gnome-photos
 gnome-shell-extension-pomodoro
@@ -32,14 +30,17 @@ powerline
 powerline-fonts
 
 # Extra wallpapers
-# f26-backgrounds-extras-base
+f30-backgrounds-extras-gnome
-# f26-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes
 -eog
 -rdesktop
 
+# temporarily removing conflicting application
+-synfigstudio
+-mypaint
+
 %end
 
 %post

fedora-live-games.ks

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

fedora-live-mate_compiz.ks

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

fedora-live-minimization.ks

@@ -5,11 +5,8 @@
 
 # save some space
 -mpage
--sox
 -hplip
--numactl
 -isdn4k-utils
--autofs
 
 # scanning takes quite a bit of space :/
 -xsane

fedora-live-python-classroom.ks

@@ -5,5 +5,7 @@
 # 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-soas.ks

@@ -5,8 +5,6 @@
 #
 # 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-lxqt-common.ks

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

fedora-mate-common.ks

@@ -35,7 +35,6 @@ 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,6 +3,10 @@
 -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-container-base-minimal.ks

@@ -1,70 +0,0 @@
-# See fedora-modular-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-modular-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 container
-# 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-container-base.ks

@@ -1,38 +0,0 @@
-# See fedora-modular-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-modular-container-common.ks
-
-%packages --excludedocs --instLangs=en --nocore
-rootfiles
-tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
-vim-minimal
-dnf
-dnf-yum  # https://pagure.io/fesco/ticket/1312#comment:29
-sssd-client
-
-%end
-
-%post --erroronfail --log=/root/anaconda-post.log
-# remove some extraneous files
-rm -rf /var/cache/dnf/*
-rm -rf /tmp/*
-
-#Mask mount units and getty service so that we don't get login prompt
-systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
-# Fix /run/lock breakage since it's not tmpfs in container
-# This unmounts /run (tmpfs) and then recreates the files
-# in the /run directory on the root filesystem of the container
-#
-# We ignore the return code of the systemd-tmpfiles command because
-# at this point we have already removed the /etc/machine-id and all
-# tmpfiles lines with %m in them will fail and cause a bad return
-# code. Example failure:
-#   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
-#
-umount /run
-systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
-
-%end

fedora-modular-container-common.ks

@@ -1,75 +0,0 @@
-# This is the common bits between Container 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.
-#
-# ##  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-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
-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 container image is a tarball
-zerombr
-clearpart --all
-autopart --nohome --noswap --nolvm
-
-%packages --excludedocs --instLangs=en --nocore
-fedora-modular-release
-bash
-coreutils-single
-glibc-minimal-langpack
-libcrypt
-rpm
-shadow-utils
-sssd-client
-util-linux
--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-modular-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-modular-disk-minimal.ks

@@ -56,8 +56,6 @@ 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-python-classroom-common.ks

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

fedora-repo.ks

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

fedora-scientific-common.ks

@@ -28,14 +28,6 @@ armadillo-devel
 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
@@ -51,8 +43,6 @@ python3-networkx
 python3-pandas
 
 # matplotlib backends
-python-matplotlib-qt4
-python-matplotlib-tk
 python3-matplotlib-qt4
 python3-matplotlib-tk
 
@@ -67,15 +57,20 @@ gcc-gfortran
 rkward
 
 # GUI for Octave
-qtoctave
+#qtoctave
 
 # julia
-julia
+# Comment out till build failure is sorted
-julia-doc
+# julia
+# julia-doc
 
 # IDEs for the IDE folks
 @eclipse
-spyder
+
+# Workaround for https://pagure.io/releng/issue/7814
+-eclipse-linuxtools-vagrant
+
+#spyder
 
 #writing & publishing
 emacs
@@ -96,7 +91,6 @@ openmpi
 openmpi-devel
 valgrind-openmpi
 libgomp
-python-pp
 mpi4py-openmpi
 python3-mpi4py-openmpi
 

fedora-soas-common.ks

@@ -92,7 +92,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
-/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+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 +163,6 @@ show-logout=false
 [org.sugarlabs.power]
 automatic=true
 EOF
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 
 %end

fedora-xfce-common.ks

@@ -38,6 +38,5 @@ system-config-printer
 -desktop-backgrounds-basic
 -aspell-*                   # dictionaries are big
 -xfce4-sensors-plugin
--foomatic-db-ppds
 
 %end

l10n/fedora-live-workstation-de_CH.ks

@@ -11,7 +11,7 @@ timezone Europe/Zurich
 
 %packages
 -gnome-blog
-@german-support
+langpacks-de
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-live-workstation-de_DE.ks

@@ -11,7 +11,7 @@ timezone Europe/Berlin
 
 %packages
 -gnome-blog
-@german-support
+langpacks-de
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-live-workstation-fr_FR.ks

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

l10n/fedora-live-workstation-ja_JP.ks

@@ -0,0 +1,40 @@
+# 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
-@dutch-support
+langpacks-nl
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-live-workstation-pt_BR.ks

@@ -10,7 +10,7 @@ keyboard br-abnt2
 timezone America/Sao_Paulo
 
 %packages
-@brazilian-support
+langpacks-pt_BR
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-live-workstation-pt_PT.ks

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

l10n/fedora-live-workstation-ru_RU.ks

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

l10n/fedora-livecd-cinnamon-de_DE.ks

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

l10n/fedora-livecd-cinnamon-ja_JP.ks

@@ -13,7 +13,7 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-@japanese-support
+langpacks-ja
 # 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
-@german-support
+langpacks-de
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-kde-de_DE.ks

@@ -10,7 +10,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-@german-support
+langpacks-de
 
 # 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
-@french-support
+langpacks-fr
 # exclude input methods:
 -m17n*
 -scim*

l10n/fedora-livecd-kde-ja_JP.ks

@@ -0,0 +1,40 @@
+# 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
-@dutch-support
+langpacks-nl
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-kde-pt_PT.ks

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

l10n/fedora-livecd-kde-ru_RU.ks

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

l10n/fedora-livecd-lxde-de_CH.ks

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

l10n/fedora-livecd-lxde-de_DE.ks

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

l10n/fedora-livecd-lxde-fr_FR.ks

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

l10n/fedora-livecd-lxde-ja_JP.ks

@@ -13,11 +13,10 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-@japanese-support
+langpacks-ja
-# exclude input methods:
+# exclude input methods except ibus:
 -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
-@russian-support
+langpacks-ru
 hunspell-ru
 
 # exclude input methods

l10n/fedora-livecd-xfce-de_CH.ks

@@ -3,14 +3,14 @@
 # Maintainer(s):
 # - Fabian Affolter <fab at fedoraproject.org>
 
-%include ../fedora-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang de_DE
 keyboard sg-latin1-nodeadkeys
 timezone Europe/Zurich
 
 %packages
-@german-support
+langpacks-de
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-de_DE.ks

@@ -3,14 +3,14 @@
 # Maintainer(s):
 # - Fabian Affolter <fab at fedoraproject.org>
 
-%include ../fedora-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang de_DE.UTF-8
 keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-@german-support
+langpacks-de
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-fr_FR.ks

@@ -6,14 +6,14 @@
 # Maintainer(s):
 # - Matthieu Saulnier <fantom@fedoraproject.org>
 
-%include ../fedora-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang fr_FR.UTF-8
 keyboard fr-latin9
 timezone Europe/Paris
 
 %packages
-@french-support
+langpacks-fr
 # exclude input methods:
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-ja_JP.ks

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

l10n/fedora-livecd-xfce-nl_NL.ks

@@ -3,14 +3,14 @@
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
 
-%include ../fedora-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang nl_NL
 keyboard us
 timezone Europe/Amsterdam
 
 %packages
-@dutch-support
+langpacks-nl
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-pt_PT.ks

@@ -3,14 +3,14 @@
 # Maintainer(s):
 # - Pedro Silva <pedrofsilva a netcabo.pt>
 
-%include ../fedora-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang pt_PT.UTF-8
 keyboard pt-latin1
 timezone Europe/Lisbon
 
 %packages
-@portuguese-support
+langpacks-pt
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-ru_RU.ks

@@ -3,14 +3,14 @@
 # Maintainer(s):
 # - Sergey Mihailov <sergey.mihailov at gmail.com>
 
-%include ../fedora-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang ru_RU.UTF-8
 keyboard ru
 timezone Europe/Moscow
 
 %packages
-@russian-support
+langpacks-ru
 hunspell-ru
 
 # exclude input methods

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

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

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

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

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

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

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

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

l10n/fedora-livedvd-games-de_CH.ks

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

l10n/fedora-livedvd-games-de_DE.ks

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

l10n/fedora-livedvd-games-ja_JP.ks

@@ -0,0 +1,40 @@
+# 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
-@dutch-support
+langpacks-nl
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-games-pt_PT.ks

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

l10n/fedora-livedvd-games-ru_RU.ks

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