arm: Update Raspberry Pi config to use universal firmware

We can now use a single U-Boot firmware to boot all 64 bit variants of the Rasperry Pi so we can now simplify this some what. Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
Don't exclude langpacks-en explicitly
2023-03-18 18:38:00 +00:00 · 2023-03-15 16:30:17 -04:00 · 2023-03-11 17:57:18 +02:00 · 2023-03-07 17:04:28 -08:00 · 2023-03-06 16:51:59 -08:00 · 2023-02-28 10:39:14 +00:00
134 changed files with 1901 additions and 2988 deletions
--- a/README.md
+++ b/README.md
@ -9,20 +9,34 @@ All changes should be made via the PR workflow.
 This project is packaged in Fedora as the spin-kickstarts package allowing users to see
 and modify the kickstart files for their local needs.
 Maintainers for each image are listed in the `maintainers.toml` file.
 ## To make a release ##
- * git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts
+    git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts
- * cd fedora-kickstarts
+    cd fedora-kickstarts
- * # If you need a specific branch other than master:
+    # If you need a specific branch other than master:
- * git checkout BRANCHNAME
+    git checkout BRANCHNAME
- * # No tag has been added yet tag HEAD with
+    # No tag has been added yet tag HEAD with
- * git tag VERSION
+    git tag VERSION
- * git push --tags
+    git push --tags
- * make
+    make
- * # Publish the released tar ball
+    # Publish the released tar ball
- * make publish
+    make publish
- * # Clean up the generated files:
+    # Clean up the generated files:
- * make clean
+    make clean
 ## Build logs ##
 To see build logs go to
 https://koji.fedoraproject.org/koji
 "Packages" tab, and filter by Fedora-Workstation-Live for example.
 Technical info about the officialy released images can be found at
 https://kojipkgs.fedoraproject.org/compose/
 # bug reports #
--- a/atomic-installer/lorax-configure-repo.tmpl
+++ b/atomic-installer/lorax-configure-repo.tmpl
@ -1,8 +0,0 @@
 ## Lorax template to configure Anaconda to use the local OSTree
 ## repository on disk.
 <%page args="ostree_osname, ostree_ref"/>
 append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
 append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
 append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
--- a/atomic-installer/lorax-embed-repo.tmpl
+++ b/atomic-installer/lorax-embed-repo.tmpl
@ -1,11 +0,0 @@
 ## Lorax template to embed an OSTree repository into the installer.iso
 ## and configure an interactive installer use to look for it.
 ##
 ## Note that we pull with depth=0 to only get *one* commit into the
 ## ISO, because we obviously don't want the full history.
 <%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>
 runcmd mkdir -p ${workdir}/iso-graft/content/repo
 runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2
 runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}
 runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}
--- a/custom/qa-test-day.ks
+++ b/custom/qa-test-day.ks
@ -111,7 +111,7 @@ firefox
 # "EOF" is quoted so that variables are not expanded. Search for "here-document"
 # in man bash.
-cat >> /etc/rc.d/init.d/livesys << "EOF"
+cat >> /var/lib/livesys/livesys-session-extra << "EOF"
 # Create Test Day welcome screen
 # Note that shebang must be written this way, else it is considered as comment
--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@ -1,102 +0,0 @@
 # 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
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@ -1,97 +0,0 @@
 lang en_US.UTF-8
 #keyboard us
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux
 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,rsyslog,chronyd,initial-setup
 %include fedora-repo.ks
 %packages
@core
@standard
@hardware-support
 kernel
 # remove this in %post
 dracut-config-generic
 -dracut-config-rescue
 # install tools needed to manage and boot arm systems
@arm-tools
 -uboot-images-armv8
 rng-tools
 chrony
 extlinux-bootloader
 bcm283x-firmware
 initial-setup
 initial-setup-gui
 -iwl*
 -ipw*
 -trousers-lib
 -usb_modeswitch
 -iproute-tc
 #lets resize / on first boot
 # dracut-modules-growroot
 # make sure all the locales are available for inital0-setup and anaconda to work
 glibc-all-langpacks
 # workaround for consequence of RHBZ #1324623: without this, with
 # yum-based creation tools, compose fails due to conflict between
 # libcrypt and libcrypt-nss. dnf does not seem to have the same
 # issue, so this may be dropped when appliance-creator is ported
 # to dnf.
 libcrypt-nss
 -libcrypt
 %end
 %post
 # Setup Raspberry Pi firmware
 cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
 cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
 cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
 sed -i '/vfat/ d' /etc/fstab
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=armhfp
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this ARM disk image"
 rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 # remove random seed, the newly installed instance should make it's own
 rm -f /var/lib/systemd/random-seed
 # Because memory is scarce resource in most arm systems we are differing from the Fedora
 # default of having /tmp on tmpfs.
 echo "Disabling tmpfs for /tmp."
 systemctl mask tmp.mount
 dnf -y remove dracut-config-generic
 # Disable network service here, as doing it in the services line
 # fails due to RHBZ #1369794
 /sbin/chkconfig network off
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 %end
--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@ -1,9 +0,0 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-kde-common.ks
 part / --size=5690 --fstype ext4
 %post
 %end
--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@ -1,7 +0,0 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-lxde-common.ks
 %post
 %end
--- a/fedora-arm-lxqt.ks
+++ b/fedora-arm-lxqt.ks
@ -1,14 +0,0 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-lxqt-common.ks
 part / --size=3800 --fstype ext4 --asprimary
 %packages
 # trojita not available on non-x86 platforms
 -trojita
 %end
 %post
 %end
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@ -1,9 +0,0 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-mate-common.ks
 part / --size=5500 --fstype ext4
 %post
 %end
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@ -1,10 +0,0 @@
 %include fedora-arm-base.ks
 %include fedora-minimal-common.ks
 part /boot --size=512 --fstype ext4
 part swap --size=256 --fstype swap
 part / --size=1250 --fstype ext4
 %packages
 -xkeyboard-config
 %end
--- a/fedora-arm-python-classroom.ks
+++ b/fedora-arm-python-classroom.ks
@ -1,8 +0,0 @@
 # Maintained by the Fedora Python SIG:
 # http://fedoraproject.org/wiki/SIGs/Python
 # mailto:python-devel@lists.fedoraproject.org
 # The ARM Workstion based Python Classroom Lab
 %include fedora-arm-workstation.ks
 %include fedora-python-classroom-gnome-common.ks
--- a/fedora-arm-server.ks
+++ b/fedora-arm-server.ks
@ -1,26 +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*
 %end
 %post
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 %end
--- a/fedora-arm-soas.ks
+++ b/fedora-arm-soas.ks
@ -1,9 +0,0 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-soas-common.ks
 part / --size=3300 --fstype ext4 --asprimary
 %post
 %end
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@ -1,17 +0,0 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-workstation-common.ks
 part / --size=5500 --fstype ext4
 %packages
 -initial-setup
 -initial-setup-gui
 %end
 %post
 # Most of the ARM X accelerated drivers need some level of CMA allocation
 sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
 %end
--- a/fedora-arm-xbase.ks
+++ b/fedora-arm-xbase.ks
@ -1,16 +0,0 @@
 %packages
@base-x
@fonts
@input-methods
@multimedia
@printing
 %end
 %post
 # Most of the ARM X accelerated drivers need some level of CMA allocation
 sed -i 's/\(append .*\)/\1 cma=192MB/' /boot/extlinux/extlinux.conf
 # Explicitly set graphical.target as default as this is how initial-setup detects which version to run
 ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
 %end
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@ -1,9 +0,0 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-common.ks
 part / --size=4000 --fstype ext4
 %post
 %end
--- a/fedora-atomic-vagrant.ks
+++ b/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
--- a/fedora-atomic.ks
+++ b/fedora-atomic.ks
@ -1,152 +0,0 @@
 # 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
--- a/fedora-budgie-common.ks
+++ b/fedora-budgie-common.ks
@ -0,0 +1,23 @@
 %packages
 fedora-release-budgie
 # Exclude unwanted groups that fedora-live-base.ks pulls in
 -@dial-up
 -@input-methods
 -@standard
 # Install budgie environment
@^budgie-desktop-environment
 # recommended apps
@budgie-desktop-apps
@libreoffice
 libreoffice-draw
 libreoffice-math
 thunderbird
 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
 -reiserfs-utils
 %end
--- a/fedora-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@ -8,20 +8,15 @@
 %packages
-@networkmanager-submodules
+fedora-release-cinnamon
-@cinnamon-desktop
+
 # install env-group to resolve RhBug:1891500
@^cinnamon-desktop-environment
@libreoffice
-
+rhythmbox
 # internet and multimedia
 pidgin
 hexchat
 transmission
 # mp3 support
 gstreamer1-plugins-ugly-free
 # extra backgrounds
-desktop-backgrounds-basic
+f36-backgrounds-extras-gnome
 f26-backgrounds-extras-gnome
 %end
--- a/fedora-cloud-atomic-pxetolive.ks
+++ b/fedora-cloud-atomic-pxetolive.ks
@ -1,36 +0,0 @@
 # PXE-to-Live Atomic: PXE boot directly into a running Atomic Host
 # https://fedoraproject.org/wiki/Changes/AtomicHost
 lang en_US.UTF-8
 keyboard us
 timezone America/New_York
 zerombr
 clearpart --all --initlabel
 rootpw --lock --iscrypted locked
 user --name=none
 bootloader --timeout=1
 network --bootproto=dhcp --device=link --activate
 # We are only able to install atomic with separate /boot partition currently
 part / --fstype="ext4" --size=6000
 part /boot --size=500 --fstype="ext4"
 shutdown
 services --disabled=docker-storage-setup
 services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
 %post
 # Ensure the root password is locked, we use cloud-init
 passwd -l root
 userdel -r none
 # We copy content of separate /boot partition to root part when building live squashfs image,
 # and we don't want systemd to try to mount it when pxe booting
 cat /dev/null > /etc/fstab
 # Disable network service here, as doing it in the services line
 # fails due to RHBZ #1369794
 /sbin/chkconfig network off
 %end
--- a/fedora-cloud-base-azure.ks
+++ b/fedora-cloud-base-azure.ks
@ -0,0 +1,24 @@
 # This is a basic Fedora cloud spin designed to work with Azure.
 # Inherit from cloud base
 %include fedora-cloud-base.ks
 %packages
 # Fedora Cloud Base includes the qemu guest agent and it is not
 # required for Azure: https://pagure.io/cloud-sig/issue/319
 -qemu-guest-agent
 WALinuxAgent
 %end
 %post --erroronfail
 cat > /etc/ssh/sshd_config.d/50-client-alive-interval.conf << EOF
 ClientAliveInterval 120
 EOF
 cat >> /etc/chrony.conf << EOF
 # Azure's virtual time source:
 # https://docs.microsoft.com/en-us/azure/virtual-machines/linux/time-sync#check-for-ptp-clock-source
 refclock PHC /dev/ptp_hyperv poll 3 dpoll -2 offset 0
 EOF
 %end
--- a/fedora-cloud-base-gcp.ks
+++ b/fedora-cloud-base-gcp.ks
@ -0,0 +1,35 @@
 # This is a basic Fedora cloud spin designed to work with GCP.
 # Note that GCP prefers UEFI so we'll need to make sure this image
 # is created from a machine that is started in UEFI mode.
 # Inherit from cloud base
 %include fedora-cloud-base.ks
 # Change serial port configuration to recommended default for GCP (ttyS0,38400n8d)
 # Don't show bootloader as it's impossible for the user to get to it in time
 # So we might as well not waste the 1 second on each boot.
 # https://cloud.google.com/compute/docs/import/import-existing-image
 bootloader --timeout=0 --location=mbr --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
 # redefine `services` here to drop cloud-init systemd unit enablements from
 # fedora-cloud-base.ks since we don't use them.
 services --enabled=sshd
 %packages
 # GCP provides its own guest environment.
 google-compute-engine-guest-configs
 -cloud-init
 # Fedora Cloud Base includes the qemu guest agent. GCP prefers
 # that it not be installed  https://pagure.io/cloud-sig/issue/319
 -qemu-guest-agent
 %end
 %post --erroronfail
 cat <<EOF > /etc/NetworkManager/conf.d/gcp-mtu.conf
 # In GCP it is recommended to use 1460 as the MTU.
 # Set it to 1460 for all connections.
 # https://cloud.google.com/network-connectivity/docs/vpn/concepts/mtu-considerations
 [connection]
 ethernet.mtu = 1460
 EOF
 %end
--- a/fedora-cloud-base-vagrant.ks
+++ b/fedora-cloud-base-vagrant.ks
@ -19,7 +19,7 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between
@ -32,6 +32,8 @@ dnf-yum
 # users setup. This can actually take a bit of time.  Just fold it
 # in to the base box disk image
 rsync
 # Add in sshfs for vagrant-sshfs plugin
 fuse-sshfs
 %end
 %post --erroronfail
@ -51,6 +53,12 @@ EOKEYS
 chmod 600 ~vagrant/.ssh/authorized_keys
 chown -R vagrant:vagrant ~vagrant/.ssh/
 cat > /etc/ssh/sshd_config.d/10-vagrant-insecure-rsa-key.conf <<EOF
 # For now the vagrant insecure key is an rsa key
 # https://github.com/hashicorp/vagrant/issues/11783
 PubkeyAcceptedKeyTypes=+ssh-rsa
 EOF
 # Further suggestion from @purpleidea (James Shubin) - extend key to root users as well
 mkdir -m 0700 -p /root/.ssh
 cp /home/vagrant/.ssh/authorized_keys /root/.ssh/authorized_keys
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@ -4,21 +4,18 @@
 # keys. Cloud-init creates a user account named "fedora" with passwordless
 # sudo access. The root password is empty and locked by default.
 #
 # Note that unlike the standard Fedora install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 #
 # This kickstart file is designed to be used with ImageFactory (in Koji).
 #
 # To do a local build, you'll need to install ImageFactory.  See
 # http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
 #
 # For a TDL file, I store one here:
-# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
+# 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://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl 
+#   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}
 #   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
@ -29,238 +26,126 @@ 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"
+# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
 bootloader --timeout=1 --location=mbr --append="no_timer_check net.ifnames=0 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
-zerombr
+# Configure for gpt with bios+uefi
-clearpart --all
+clearpart --all --initlabel --disklabel=gpt
-autopart --noboot --nohome --noswap --nolvm
+part prepboot  --size=4    --fstype=prepboot
 part biosboot  --size=1    --fstype=biosboot
 part /boot/efi --size=100  --fstype=efi
 part /boot     --size=1000  --fstype=ext4 --label=boot
 part btrfs.007 --size=2000 --fstype=btrfs --grow
 btrfs none --label=fedora btrfs.007
 btrfs /home --subvol --name=home LABEL=fedora
 btrfs /     --subvol --name=root LABEL=fedora
 %include fedora-repo.ks
 reboot
-# Package list.
+##### begin package list #############################################
-# FIXME: instLangs does not work, so there's a hack below
+%packages --instLangs=en
 # (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
 # FIXME: instLangs bug has been fixed but now having instLangs
 # with an arg causes no langs to get installed because of BZ1262040
 # which yields the errors in BZ1261249. For now fix by not using
 # --instLangs at all
 #%packages --instLangs=en
 %packages
-kernel-core
+# Include packages for the cloud-server-environment group
@^cloud-server-environment
 # Need to pull in the udev subpackage
 systemd-udev
-# after move away from grub2 - let's add 'which' back
+# Don't include the kernel toplevel package since it pulls in
-which
+# kernel-modules. We're happy for now with kernel-core.
 -kernel
 kernel-core
-# rescue mode generally isn't useful in the cloud context
+# Don't include dracut-config-rescue. It will have dracut generate a
 # "rescue" entry in the grub menu, but that also means there is a
 # rescue kernel and initramfs that get created, which (currently) add
 # about another 40MiB to the /boot/ partition. Also the "rescue" mode
 # is generally not useful in the cloud.
 -dracut-config-rescue
-# Some things from @core we can do without in a minimal install
+# Plymouth provides a graphical boot animation. In the cloud we don't
-biosdevname
+# need a graphical boot animation. This also means anaconda won't put
-# Need to also add back plymouth in order to mask failure of
+# rhgb/quiet on kernel command line
 # systemd-vconsole-setup.service. BZ#1272684. Comment out for now
 #-plymouth
 -NetworkManager
 -iprutils
 # Now that BZ#1199868 is fixed kbd really gets removed but it breaks
 # systemd-vconsole-setup.service on boot. Comment out for now
 #-kbd
 -uboot-tools
 -kernel
 # No need for plymouth. Also means anaconda won't put rhgb/quiet
 # on kernel command line
 -plymouth
 # Install qemu-guest-agent https://pagure.io/cloud-sig/issue/319 To
 # improve the integration with OpenStack and other VM management
 # systems (oVirt, KubeVirt).
 qemu-guest-agent
 # No need for firewalld for now. We don't have a firewall on by default.
 -firewalld
 # Don't include the geolite2 databases, which end up with 66MiB
 # in /usr/share/GeoIP
 -geolite2-country
 -geolite2-city
 %end
 ##### end package list ###############################################
-
+##### begin kickstart post ###########################################
 %post --erroronfail
-# Create grub.conf for EC2. This used to be done by appliance creator but
+if [ "$(arch)" = "x86_64" ]; then
-# anaconda doesn't do it. And, in case appliance-creator is used, we're
+# Set up legacy BIOS boot if we booted from UEFI
-# overriding it here so that both cases get the exact same file.
+grub2-install --target=i386-pc /dev/vda
-# Note that the console line is different -- that's because EC2 provides
+fi
 # different virtual hardware, and this is a convenient way to act differently
 echo -n "Creating grub.conf for pvgrub"
 rootuuid=$( awk '$2=="/" { print $1 };'  /etc/fstab )
 mkdir /boot/grub
 echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
 for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
  echo "title Fedora ($kv)" >> /boot/grub/grub.conf
  echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
  echo
 done
 # Blivet sets pmbr_boot flag erroneously and we need to purge it
 # otherwise it'll fail to boot
 parted /dev/vda disk_set pmbr_boot off
-#link grub.conf to menu.lst for ec2 to work
+# linux-firmware is installed by default and is quite large. As of mid 2020:
-echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
+#   Total download size: 97 M
-ln -sf grub.conf /boot/grub/menu.lst
+#   Installed size: 268 M
-ln -sf /boot/grub/grub.conf /etc/grub.conf
+# So far we've been fine shipping without it so let's continue.
-
+# More discussion about this in #1234504.
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
 # 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 .
 # this is installed by default but we don't need it in virt
 # Commenting out the following for #1234504
 # rpm works just fine for removing this, no idea why dnf can't cope
 echo "Removing linux-firmware package."
 rpm -e linux-firmware
-# Remove firewalld; was supposed to be optional in F18+, but is pulled in
+# See the systemd-random-seed.service man page that says:
-# in install/image building.
+#   " It is recommended to remove the random seed from OS images intended
-echo "Removing firewalld."
+#     for replication on multiple systems"
 # FIXME! clean_requirements_on_remove is the default with DNF, but may
 # 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 erase "firewalld*"
 # 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 erase authconfig
 # instlang hack. (Note! See bug referenced above package list)
 find /usr/share/locale -mindepth  1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
 localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
 # this will kill a live system (since it's memory mapped) but should be safe offline
 mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
 build-locale-archive
 echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
 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.
 # and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
 cat > /etc/sysconfig/network << EOF
 NETWORKING=yes
 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"
 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 "Cleaning old dnf repodata."
 # FIXME: clear history?
 dnf clean all
 truncate -c -s 0 /var/log/dnf.log
 truncate -c -s 0 /var/log/dnf.rpm.log
 echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+releasever=$(rpm --eval '%{fedora}')
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 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*
 # FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
 # ignore return code because UEFI systems with vfat filesystems
 # that don't support selinux will give us errors
 /usr/sbin/fixfiles -R -a restore || true
 echo "Zeroing out empty space."
 # Create zeros file with nodatacow and no compression
 touch /var/tmp/zeros
 chattr +C /var/tmp/zeros
 # 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.)"
 # Force sync to disk (Cf. https://pagure.io/cloud-sig/issue/340#comment-743430)
 btrfs filesystem sync /
 rm -f /var/tmp/zeros
 btrfs filesystem sync /
-# For trac ticket https://fedorahosted.org/cloud/ticket/128
+# When we build the image a networking config file gets left behind.
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
+# Let's clean it up.
 echo "Cleanup leftover networking configuration"
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
-# Enable network service here, as doing it in the services line
+# Truncate the /etc/resolv.conf left over from NetworkManager during the
-# fails due to RHBZ #1369794
+# kickstart. This causes delays in boot with cloud-init because the
-/sbin/chkconfig network on
+# 192.168.122.1 DNS server cannot be reached.
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 # Anaconda is writing an /etc/resolv.conf from the install environment.
 # The system should start out with an empty file, otherwise cloud-init
 # will try to use this information and may error:
 # https://bugs.launchpad.net/cloud-init/+bug/1670052
 truncate -s 0 /etc/resolv.conf
-%end
+# Clear machine-id on pre generated images
 truncate -s 0 /etc/machine-id
 %end
 ##### end kickstart post ############################################
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@ -1,221 +0,0 @@
 # This is a Fedora 21 spin designed based on the Fedora Cloud Base Image
 # but tailored specifically for Big Data processing out-of-the-box.
 # Primarily, it builds on that image but adds extra packages, but over
 # time may have additional focus.
 #
 # It's configured with cloud-init so it will take advantage of
 # ec2-compatible metadata services for provisioning ssh keys. Cloud-init
 # creates a user account named "fedora" with passwordless sudo access. The
 # root password is empty and locked by default.
 #
 # Note that unlike the standard F20 install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 text
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
 firewall --disabled
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 network --bootproto=dhcp --device=eth0 --activate --onboot=on
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 zerombr
 clearpart --all
 part / --size 3000 --fstype ext4
 %include fedora-repo.ks
 reboot
 # Package list.
 %packages
 fedora-release-cloud
 kernel-core
@core
@cloud-server
 # Needed initially, but removed below.
 firewalld
 # rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
 -NetworkManager
 -iprutils
 -kbd
 -uboot-tools
 -kernel
 -grub2
 %end
 %post --erroronfail
 # Create grub.conf for EC2. This used to be done by appliance creator but
 # anaconda doesn't do it. And, in case appliance-creator is used, we're
 # overriding it here so that both cases get the exact same file.
 # Note that the console line is different -- that's because EC2 provides
 # different virtual hardware, and this is a convenient way to act differently
 echo -n "Creating grub.conf for pvgrub"
 rootuuid=$( awk '$2=="/" { print $1 };'  /etc/fstab )
 mkdir /boot/grub
 echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
 for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
  echo "title Fedora ($kv)" >> /boot/grub/grub.conf
  echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
  echo
 done
 #link grub.conf to menu.lst for ec2 to work
 echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
 ln -sf grub.conf /boot/grub/menu.lst
 ln -sf /boot/grub/grub.conf /etc/grub.conf
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none
 # 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 .
 # this is installed by default but we don't need it in virt
 # Commenting out the following for #1234504
 # rpm works just fine for removing this, no idea why dnf can't cope
 echo "Removing linux-firmware package."
 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"
 # 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"
 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 "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)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 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*
 # This is a temporary workaround for
 # <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
 # where sfdisk seems to be messing up the mbr.
 # Long-term fix is to address this in anaconda directly and remove this.
 # <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
 dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
 mkdir -p /var/cache/yum
 /usr/sbin/fixfiles -R -a restore
 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.)"
 # Enable network service here, as doing it in the services line
 # fails due to RHBZ #1369794
 /sbin/chkconfig network on
 %end
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@ -1,215 +0,0 @@
 # This is a spin of the Fedora cloud image designed for trying out new
 # images in rawhide. It won't be built for non-rawhide trees, let alone
 # actual releases.
 cmdline
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
 firewall --disabled
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 network --bootproto=dhcp --device=eth0 --activate --onboot=on
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 zerombr
 clearpart --all
 part / --size 3000 --fstype ext4
 %include fedora-repo.ks
 reboot
 # Package list.
 %packages --excludedocs --instLangs=en_US
 fedora-release-cloud
 kernel-core
@core
@cloud-server
 # rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 # Needed initially, but removed below.
 firewalld
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
 -NetworkManager
 -iprutils
 -kbd
 -uboot-tools
 -kernel
 -grub2
 %end
 %post --erroronfail
 # Create grub.conf for EC2. This used to be done by appliance creator but
 # anaconda doesn't do it. And, in case appliance-creator is used, we're
 # overriding it here so that both cases get the exact same file.
 # Note that the console line is different -- that's because EC2 provides
 # different virtual hardware, and this is a convenient way to act differently
 echo -n "Creating grub.conf for pvgrub"
 rootuuid=$( awk '$2=="/" { print $1 };'  /etc/fstab )
 mkdir /boot/grub
 echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
 for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
  echo "title Fedora ($kv)" >> /boot/grub/grub.conf
  echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
  echo
 done
 #link grub.conf to menu.lst for ec2 to work
 echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
 ln -sf grub.conf /boot/grub/menu.lst
 ln -sf /boot/grub/grub.conf /etc/grub.conf
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none
 # 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 .
 # this is installed by default but we don't need it in virt
 # Commenting out the following for #1234504
 # rpm works just fine for removing this, no idea why dnf can't cope
 echo "Removing linux-firmware package."
 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"
 # 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"
 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 "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)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 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*
 # This is a temporary workaround for
 # <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
 # where sfdisk seems to be messing up the mbr.
 # Long-term fix is to address this in anaconda directly and remove this.
 # <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
 dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
 mkdir -p /var/cache/yum
 chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
 dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 # Enable network service here, as doing it in the services line
 # fails due to RHBZ #1369794
 /sbin/chkconfig network on
 %end
--- a/fedora-comp-neuro-common.ks
+++ b/fedora-comp-neuro-common.ks
@ -0,0 +1,29 @@
 # Description: Packages for the NeuroFedora computational neuroscience lab image.
 #
 # Maintained by the NeuroFedora SIG:
 # https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org
 %packages
 fedora-release-compneuro
 # Includes numpy, scipy, jupyter, pandas, scikit, scipy, statsmodels, sympy, matplotlib
@python-science
 #Computational neuroscience packages
 arbor
 genesis-simulator
 moose
 nest
 neuron
 neuron-devel
 python3
 python3-brian2
 python3-ipython
 python3-lfpy
 python3-nest
 python3-netpyne
 python3-neuron
 python3-pynn
 python3-steps
 %end
--- a/fedora-container-base-minimal.ks
+++ b/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
--- a/fedora-container-base.ks
+++ b/fedora-container-base.ks
@ -1,20 +1,22 @@
-# 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
+%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 rootfiles
 # https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
 fedora-repos-modular
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
-sssd-client
+sudo
-
+-glibc-langpack-en
 -langpacks-en
 %end
 %post --erroronfail --log=/root/anaconda-post.log
 # remove some extraneous files
 rm -rf /var/cache/dnf/*
 rm -rf /tmp/*
@ -22,8 +24,6 @@ rm -rf /tmp/*
 # https://pagure.io/atomic-wg/issue/308
 printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
 # Fix /run/lock breakage since it's not tmpfs in docker
@ -37,7 +37,21 @@ systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connec
 #   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
 #
 umount /run
-systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
+rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316
-rm /run/nologin # https://pagure.io/atomic-wg/issue/316
+
 # Final pruning
 rm -rfv /var/cache/* /var/log/* /tmp/*
 %end
 %post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
 set -eux
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
 # NOTE: run this in nochroot because "find" does not exist in chroot
 KEEPLANG=en_US
 for dir in locale i18n; do
    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
 done
 %end
--- a/fedora-modular-docker-common.ks
+++ b/fedora-modular-docker-common.ks
@ -1,4 +1,4 @@
-# This is the common bits between Docker base images based on Modular Fedora.
+# 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,13 +12,14 @@
 #
 # Then, once you have imagefactory and imagefactory-plugins installed, run:
 #
-#   ksflatten -c fedora-modular-base[-minimal].ks -o fedora-modular-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-modular-base-test.ks modular
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-container-base-test.ks docker
 #
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
+timezone --isUtc Etc/UTC
 timesource --ntp-disable
 rootpw --lock --iscrypted locked
 keyboard us
 network --bootproto=dhcp --device=link --activate --onboot=on
@ -29,27 +30,28 @@ zerombr
 clearpart --all
 autopart --noboot --nohome --noswap --nolvm
-%packages --excludedocs --instLangs=en --nocore
+%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
-fedora-modular-release
+fedora-release-container
 bash
-coreutils-single
+coreutils
 glibc-minimal-langpack
 libcrypt
 rpm
-shadow-utils
+util-linux-core
 sssd-client
 util-linux
 -kernel
 -dosfstools
 -e2fsprogs
 -fuse-libs
 -gnupg2-smime
 -libss # used by e2fsprogs
 -libusbx
 -pinentry
 -shared-mime-info
 -trousers
 -xkeyboard-config
 -grubby
 -langpacks-en_GB
 # https://bugzilla.redhat.com/show_bug.cgi?id=1951111
 -util-linux
 -sssd-client
 %end
@ -61,9 +63,18 @@ 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-modular-release)
+releasever=$(rpm --eval '%{?fedora}')
 # When building ELN containers, we don't have the %{fedora} macro
 if [ -z $releasever ]; then
  releasever=eln
 fi
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "# fstab intentionally empty for containers" > /etc/fstab
@ -72,4 +83,6 @@ echo "# fstab intentionally empty for containers" > /etc/fstab
 rm -f /etc/machine-id
 touch /etc/machine-id
 echo "# resolv placeholder" > /etc/resolv.conf
 chmod 644 /etc/resolv.conf
 %end
--- a/fedora-design-suite-common.ks
+++ b/fedora-design-suite-common.ks
@ -0,0 +1,31 @@
 %packages
 # Switch to groups for design suite
@design-suite
 # Identify as Fedora Design Suite
 fedora-release-designsuite
 # Provides backup application
 deja-dup
 deja-dup-nautilus
 # Add extra gnome applications
 #gnome-books
 gnome-calendar
 gnome-photos
 gnome-pomodoro
 gnome-todo
 # Add cosmetic for terminal
 powerline
 powerline-fonts
 # removal of unneeded applications
 -gnome-boxes
 # temporarily removing conflicting application
 -mypaint
 -sparkleshare
 %end
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@ -11,7 +11,6 @@ text
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
 services --enabled=sshd,NetworkManager,chronyd
@ -19,7 +18,7 @@ network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+bootloader --timeout=1
 zerombr
 clearpart --all --initlabel --disklabel=msdos
@ -40,55 +39,55 @@ dracut-config-generic
 -dracut-config-rescue
 # install tools needed to manage and boot arm systems
@arm-tools
 -uboot-images-armv7
 rng-tools
 chrony
 bcm283x-firmware
 initial-setup
 # Intel wireless firmware assumed never of use for disk images
 -iwl*
 -ipw*
 -trousers-lib
 -usb_modeswitch
 -iproute-tc
 -generic-release*
-# make sure all the locales are available for inital0-setup and anaconda to work
+# make sure all the locales are available for inital-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
 # Find the architecture we are on
 arch=$(uname -m)
 # Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
+if [[ $arch == "aarch64" ]]; then
-mv -f /boot/efi/config-64.txt /boot/efi/config.txt
+cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+fi
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 # remove random seed, the newly installed instance should make it's own
 rm -f /var/lib/systemd/random-seed
-dnf -y remove dracut-config-generic
+# The enp1s0 interface is a left over from the imagefactory install, clean this up
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
-# Disable network service here, as doing it in the services line
+dnf -y remove dracut-config-generic
 # fails due to RHBZ #1369794
 /sbin/chkconfig network off
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 # Anaconda adds console=tty0 to the grub boot line on all images. this is problematic
 # when you are using fedora via serial console as you do not get any output post grub
 # linux does a good job of knowing what consoles need to be enabled.
 # https://bugzilla.redhat.com/show_bug.cgi?id=2022757
 if [[ $arch == "aarch64" ]]; then
 sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
 fi
 %end
--- a/fedora-disk-budgie.ks
+++ b/fedora-disk-budgie.ks
@ -0,0 +1,5 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-budgie-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-disk-kde.ks
+++ b/fedora-disk-kde.ks
@ -0,0 +1,5 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-kde-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-disk-lxqt.ks
+++ b/fedora-disk-lxqt.ks
@ -0,0 +1,5 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-lxqt-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-disk-minimal.ks
+++ b/fedora-disk-minimal.ks
@ -3,8 +3,4 @@
 services --enabled=sshd,NetworkManager,chronyd,initial-setup
-autopart --type=plain
+autopart --type=plain --noswap
 %packages
 -xkeyboard-config
 %end
--- a/fedora-disk-phosh.ks
+++ b/fedora-disk-phosh.ks
@ -0,0 +1,5 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-phosh-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-disk-python-classroom.ks
+++ b/fedora-disk-python-classroom.ks
@ -0,0 +1,20 @@
 # Maintained by the Fedora Python SIG:
 # http://fedoraproject.org/wiki/SIGs/Python
 # mailto:python-devel@lists.fedoraproject.org
 # The Workstion based Python Classroom Lab
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-workstation-common.ks
 %include fedora-python-classroom-gnome-common.ks
 autopart --type=btrfs --noswap
 %packages
 -initial-setup
 -initial-setup-gui
 -libvirt*
 -gnome-boxes
 %end
--- a/fedora-disk-server.ks
+++ b/fedora-disk-server.ks
@ -2,15 +2,22 @@
 services --enabled=sshd,NetworkManager,chronyd,initial-setup
-autopart
+autopart --noswap
 %packages
-# install the default groups for the server evironment since installing the environment is not working
+fedora-release-server
 # 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
--- a/fedora-disk-soas.ks
+++ b/fedora-disk-soas.ks
@ -0,0 +1,5 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-soas-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-disk-workstation.ks
+++ b/fedora-disk-workstation.ks
@ -2,18 +2,10 @@
 %include fedora-disk-xbase.ks
 %include fedora-workstation-common.ks
-bootloader --append="cma=256MB"
+autopart --type=btrfs --noswap
 services --enabled=sshd,NetworkManager,chronyd
 autopart --type=plain
 %packages
 -initial-setup
 -initial-setup-gui
 %end
 %post
 %end
--- a/fedora-disk-xbase.ks
+++ b/fedora-disk-xbase.ks
@ -5,6 +5,7 @@
@multimedia
@printing
 -@guest-desktop-agents
 initial-setup-gui
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts
--- a/fedora-disk-xfce.ks
+++ b/fedora-disk-xfce.ks
@ -0,0 +1,5 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-xfce-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-docker-common.ks
+++ b/fedora-docker-common.ks
@ -1,68 +0,0 @@
 # 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
--- a/fedora-eln-container-base.ks
+++ b/fedora-eln-container-base.ks
@ -0,0 +1,60 @@
 # See fedora-container-common.ks for details on how to hack on container image kickstarts
 # This base is a standard Fedora-ELN image with python3 and dnf
 %include fedora-container-common.ks
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 -fedora-release-container
 fedora-release-eln
 fedora-repos-eln
 rootfiles
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sudo
 -glibc-langpack-en
 -langpacks-en
 %end
 %post --erroronfail --log=/root/anaconda-post.log
 set -eux
 # remove some extraneous files
 rm -rf /var/cache/dnf/*
 rm -rf /tmp/*
 # https://pagure.io/atomic-wg/issue/308
 printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
 # Fix /run/lock breakage since it's not tmpfs in docker
 # This unmounts /run (tmpfs) and then recreates the files
 # in the /run directory on the root filesystem of the container
 #
 # We ignore the return code of the systemd-tmpfiles command because
 # at this point we have already removed the /etc/machine-id and all
 # tmpfiles lines with %m in them will fail and cause a bad return
 # code. Example failure:
 #   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
 #
 umount /run
 rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316
 # Final pruning
 rm -rfv /var/cache/* /var/log/* /tmp/*
 %end
 %post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
 set -eux
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
 # NOTE: run this in nochroot because "find" does not exist in chroot
 KEEPLANG=en_US
 for dir in locale i18n; do
    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
 done
 %end
--- a/fedora-eln-guest.ks
+++ b/fedora-eln-guest.ks
@ -0,0 +1,238 @@
 # Kickstart file to build Fedora ELN Guest image.
 # This image is used to test Fedora ELN content for
 # the cloud instances. This image provides minimally configured
 # system image.
 text
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York
 # add console and reorder in %post
 bootloader --timeout=1 --location=mbr --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0"
 selinux --enforcing
 firewall --enabled --service=ssh
 network --bootproto=dhcp --device=link --activate --onboot=on
 #services --enabled=sshd,ovirt-guest-agent --disabled kdump,rhsmcertd
 services --enabled=sshd,NetworkManager,cloud-init,cloud-init-local,cloud-config,cloud-final --disabled kdump,rhsmcertd
 rootpw --iscrypted nope
 #
 # Partition Information. Change this as necessary
 # This information is used by appliance-tools but
 # not by the livecd tools.
 #
 zerombr
 clearpart --all --initlabel
 # autopart --type=plain --nohome # --nohome doesn't work because of rhbz#1509350
 # autopart is problematic in that it creates /boot and swap partitions rhbz#1542510 rhbz#1673094
 reqpart
 part / --fstype="xfs" --ondisk=vda --size=8000
 reboot
 # Packages
 %packages
@core
 dnf
 kernel
 yum
 nfs-utils
 dnf-utils
 # pull firmware packages out
 -aic94xx-firmware
 -alsa-firmware
 -alsa-lib
 -alsa-tools-firmware
 -ivtv-firmware
 -iwl1000-firmware
 -iwl100-firmware
 -iwl105-firmware
 -iwl135-firmware
 -iwl2000-firmware
 -iwl2030-firmware
 -iwl3160-firmware
 -iwl3945-firmware
 -iwl4965-firmware
 -iwl5000-firmware
 -iwl5150-firmware
 -iwl6000-firmware
 -iwl6000g2a-firmware
 -iwl6000g2b-firmware
 -iwl6050-firmware
 -iwl7260-firmware
 -libertas-sd8686-firmware
 -libertas-sd8787-firmware
 -libertas-usb8388-firmware
 # cloud-init does magical things with EC2 metadata, including provisioning
 # a user account with ssh keys.
 cloud-init
 ## Adding a dependency for cloud-init as recommended by tdawson
 python3-jsonschema
 # rhevm guest-agent (Not available in ELN yet)
 #rhevm-guest-agent-common
 # allows the host machine to issue commands to the guest operating system
 qemu-guest-agent
 # need this for growpart, because parted doesn't yet support resizepart
 # https://bugzilla.redhat.com/show_bug.cgi?id=966993
 #cloud-utils
 #heat-cfntools  # Not available in ELN (yet?)
 cloud-utils-growpart
 # We need this image to be portable; also, rescue mode isn't useful here.
 dracut-config-generic
 # Don't include dracut-config-rescue. It will have dracut generate a
 # "rescue" entry in the grub menu, but that also means there is a
 # rescue kernel and initramfs that get created, which (currently) add
 # about another 40MiB to the /boot/ partition. Also the "rescue" mode
 # is generally not useful in the cloud.
 -dracut-config-rescue
 # Needed initially, but removed below.
 firewalld
 # cherry-pick a few things from @base
 tar
 tcpdump
 rsync
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
 -iprutils
 # Minimal Cockpit web console
 cockpit-ws
 cockpit-system
 subscription-manager-cockpit
 # rh-amazon-rhui-client
 # Exclude all langpacks for now
 -langpacks-*
 # We are building Fedora-ELN
 fedora-release-eln
 fedora-repos-eln
 # Add rng-tools as source of entropy
 rng-tools
 %end
 #
 # Add custom post scripts after the base post.
 #
 %post --erroronfail
 # workaround anaconda requirements
 passwd -d root
 passwd -l root
 # 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 .
 # this is installed by default but we don't need it in virt
 echo "Removing linux-firmware package."
 dnf -C -y remove linux-firmware
 # Remove firewalld; it is required to be present for install/image building.
 echo "Removing firewalld."
 dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
 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
 # 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-name-slot.rules
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
 # simple eth0 config, again not hard-coded to the build hardware
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
 DEVICE="eth0"
 BOOTPROTO="dhcp"
 BOOTPROTOv6="dhcp"
 ONBOOT="yes"
 TYPE="Ethernet"
 USERCTL="yes"
 PEERDNS="yes"
 IPV6INIT="yes"
 PERSISTENT_DHCLIENT="1"
 EOF
 # set virtual-guest as default profile for tuned
 echo "virtual-guest" > /etc/tuned/active_profile
 # 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 .
 cat <<EOL > /etc/sysconfig/kernel
 # UPDATEDEFAULT specifies if new-kernel-pkg should make
 # new kernels the default
 UPDATEDEFAULT=yes
 # DEFAULTKERNEL specifies the default kernel package type
 DEFAULTKERNEL=kernel
 EOL
 # make sure firstboot doesn't start
 echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 # workaround https://bugzilla.redhat.com/show_bug.cgi?id=966888
 if ! grep -q growpart /etc/cloud/cloud.cfg; then
  sed -i 's/ - resizefs/ - growpart\n - resizefs/' /etc/cloud/cloud.cfg
 fi
 # allow sudo powers to cloud-user
 echo -e 'cloud-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
 # Disable subscription-manager yum plugins
 sed -i 's|^enabled=1|enabled=0|' /etc/yum/pluginconf.d/product-id.conf
 sed -i 's|^enabled=1|enabled=0|' /etc/yum/pluginconf.d/subscription-manager.conf
 echo "Cleaning old yum repodata."
 dnf clean all
 # clean up installation logs"
 rm -rf /var/log/yum.log
 rm -rf /var/lib/yum/*
 rm -rf /root/install.log
 rm -rf /root/install.log.syslog
 rm -rf /root/anaconda-ks.cfg
 rm -rf /var/log/anaconda*
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
 mkdir -p /var/cache/yum
 /usr/sbin/fixfiles -R -a restore
 # remove random-seed so it's not the same every time
 rm -f /var/lib/systemd/random-seed
 # Remove machine-id on the pre generated images
 cat /dev/null > /etc/machine-id
 # Anaconda is writing to /etc/resolv.conf from the generating environment.
 # The system should start out with an empty file.
 truncate -s 0 /etc/resolv.conf
 %end
--- a/fedora-i3-common.ks
+++ b/fedora-i3-common.ks
@ -0,0 +1,35 @@
 # fedora-livecd-i3.ks
 #
 # Description:
 # - Fedora Live Spin with the tiling window manager i3wm
 #
 # Maintainer(s):
 # - Nasir Hussain    <nasirhm@fedoraproject.org>
 # - Eduard Lucena    <x3mboy@fedoraproject.org>
 # - Justin W. Flory  <jwf@fedoraproject.org>
 # - Dan Cermak       <defolos@fedoraproject.org>
 %packages
@^i3-desktop-environment
 feh
 dex-autostart
 thunar
 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
 # Admin tools are handy to have
@admin-tools
 wget
 # Better more popular browser
 system-config-printer
 # save some space
 -autofs
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
 -aspell-*                   # dictionaries are big
 %end
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@ -0,0 +1,88 @@
 # This is the kickstart for Fedora IoT disk images.
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 selinux --enforcing
 rootpw --lock --iscrypted locked
 bootloader --timeout=1 --append="modprobe.blacklist=vc4"
 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=NetworkManager,sshd
 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/rawhide/${basearch}/iot
 reboot
 %post --erroronfail
 # Find the architecture we are on
 arch=$(uname -m)
 # Setup Raspberry Pi firmware
 if [[ $arch == "aarch64" ]]; then
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
 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/rawhide/${arch}/iot"
 # Make sure the ref we're supposedly sitting on (according
 # to the updated origin) exists.
 ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --create "fedora-iot:fedora/rawhide/${arch}/iot"
 # Remove the old ref so that the commit eventually gets cleaned up.
 ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --delete
 # delete/add the remote with new options to enable gpg verification
 # and to point them at the cdn url
 ostree remote delete fedora-iot
 ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/ --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
 # We're getting a stray console= from somewhere, work around it
 rpm-ostree kargs --delete=console=tty0
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
 # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
 cp /etc/skel/.bash* /var/roothome
 # Remove any persistent NIC rules generated by udev
 rm -vf /etc/udev/rules.d/*persistent-net*.rules
 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 --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 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.)"
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
 # Anaconda is writing an /etc/resolv.conf from the install environment.
 # The system should start out with an empty file, otherwise cloud-init
 # will try to use this information and may error:
 # https://bugs.launchpad.net/cloud-init/+bug/1670052
 truncate -s 0 /etc/resolv.conf
 %end
--- a/fedora-kde-common.ks
+++ b/fedora-kde-common.ks
@ -1,78 +1,41 @@
 %packages
 # install env-group to resolve RhBug:1891500
@^kde-desktop-environment
@firefox
@kde-apps
@kde-desktop
@kde-media
-@kde-office
+@libreoffice
-@kde-telepathy
+# add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
-@networkmanager-submodules
+libreoffice-draw
 libreoffice-math
 fedora-release-kde
 -@admin-tools
 # drop tracker stuff pulled in by gtk3 (pagureio:fedora-kde/SIG#124)
 -tracker-miners
 -tracker
 ### The KDE-Desktop
 ### Browser
 qupzilla
 ### fixes
 # use kde-print-manager instead of system-config-printer
 -system-config-printer
 # make sure mariadb lands instead of MySQL (hopefully a temporary hack)
 mariadb-embedded
 mariadb-libs
 mariadb-server
 # minimal localization support - allows installing the kde-l10n-* packages
 system-config-language
 kde-l10n
 # unwanted packages from @kde-desktop
 # don't include these for now to fit on a cd
 -desktop-backgrounds-basic
 -kdeaccessibility*
 #-ktorrent			# kget has also basic torrent features (~3 megs)
 -digikam			# digikam has duplicate functionality with gwenview (~28 megs)
 #-amarok 			# ~23 megs (mysql-embedded etc.)
 -kipi-plugins			# ~8 megs + drags in Marble
 #-kdeplasma-addons		# ~16 megs
 #-krusader			# ~4 megs
 # Additional packages that are not default in kde-* groups, but useful
 k3b				# ~15 megs
 #kdeartwork			# only include some parts of kdeartwork
 fuse
 mediawriter
 # only include kdegames-minimal
 -kdegames
 kdegames-minimal
 ### space issues
-
+-ktorrent			# kget has also basic torrent features (~3 megs)
-# fonts (we make no bones about admitting we're english-only)
+-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
-wqy-microhei-fonts			# a compact CJK font, to replace:
+-kipi-plugins			# ~8 megs + drags in Marble
-naver-nanum-gothic-fonts		# Korean
+-krusader			# ~4 megs
-vlgothic-fonts				# Japanese
+-k3b				# ~15 megs
 -adobe-source-han-sans-cn-fonts		# simplified Chinese
 -adobe-source-han-sans-tw-fonts 	# traditional Chinese
 -paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
 #-stix-fonts		# mathematical symbols
 # remove input methods to free space
 -@input-methods
 -scim*
 -m17n*
 -ibus*
 -iok
 # admin-tools
 -gnome-disk-utility
 # kcm_clock still lacks some features, so keep system-config-date around
 #-system-config-date
 # prefer kcm_systemd
 -system-config-services
 # prefer/use kusers
 -system-config-users
 ## avoid serious bugs by omitting broken stuff
--- a/fedora-live-astronomy_kde.ks
+++ b/fedora-live-astronomy_kde.ks
@ -14,42 +14,43 @@
 # Maintainer: Christian Dersch <lupinix@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Lupinix
-%include fedora-live-kde.ks
+%include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
 # The recommended part size for DVDs is too close to use for the astronomy spin
-part / --size 14500
+part / --size 16000
 %packages
 # 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
 psfex
 saoimage
 scamp
 sextractor
-siril
+#siril
 skyviewer
 swarp
 wcstools
-# Observatory: KStars + INDI drivers + Skychart
+# Observatory: KStars + INDI drivers
-indi-aagcloudwatcher
+indi-3rdparty-drivers
 indi-apogee
 indi-eqmod
 indi-gphoto
 indi-sx
 indistarter
 kstars
 stellarium
 # misc. astronomy
-celestia
+#celestia
-virtualplanet
+stellarium
 #virtualplanet
 # Some astro environment stuff
 astronomy-menus
@ -77,7 +78,6 @@ astropy-tools
 ginga
 python3-astropy
 python3-astroML
 python3-astroML-addons
 python3-astroquery
 python3-astroscrappy
 python3-APLpy
@ -89,10 +89,8 @@ python3-photutils
 python3-pyvo
 python3-reproject
 python3-sep
 python3-wcsaxes
 # matplotlib backends
 python3-matplotlib-qt4
 python3-matplotlib-qt5
 python3-matplotlib-tk
@ -100,10 +98,11 @@ python3-matplotlib-tk
 # Python IDE very useful for scientific use
 python3-spyder
-#Version control- a GUI for each as well
+# BOINC for distributed computing
 boinc-client
 boinc-manager
-# Installing rapidsvn will also install subversion package
+#Version control- a GUI for each as well
 rapidsvn 
 git
 git-gui
@ -113,17 +112,18 @@ gimp
 kst
 kst-docs
 kst-fits
-LabPlot
+# LabPlot currently not installable due to #2044284
 #LabPlot
 #Misc. Utils
 # icedtea-web to have webstart useful for VO tools
 icedtea-web
 ImageMagick
 kate
 kate-plugins
 rlwrap
 screen
-plasma-applet-redshift-control
+
 # Java JRE for VO tools
 java
 # Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
 -kde-l10n-*
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@ -10,7 +10,6 @@
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
@ -25,265 +24,39 @@ shutdown
 %include fedora-repo.ks
 %packages
@base-x
@guest-desktop-agents
@standard
@core
@fonts
@input-methods
@dial-up
@multimedia
@hardware-support
@printing
 # Explicitly specified here:
 # <notting> walters: because otherwise dependency loops cause yum issues.
 kernel
 kernel-modules
 kernel-modules-extra
 # This was added a while ago, I think it falls into the category of
 # "Diagnosis/recovery tool useful from a Live OS image".  Leaving this untouched
 # for now.
 memtest86+
 # The point of a live image is to install
 anaconda
 anaconda-install-env-deps
 anaconda-live
@anaconda-tools
 # Anaconda has a weak dep on this and we don't want it on livecds, see
 # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD
 -fcoe-utils
 -device-mapper-multipath
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 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
 # provide the livesys scripts
 livesys-scripts
 %end
 %post
-# FIXME: it'd be better to get this installed from a package
+# Enable livesys services
-cat > /etc/rc.d/init.d/livesys << EOF
+systemctl enable livesys.service
-#!/bin/bash
+systemctl enable livesys-late.service
 #
 # live: Init script for live image
 #
 # chkconfig: 345 00 99
 # description: Init script for live image.
 ### BEGIN INIT INFO
 # X-Start-Before: display-manager chronyd
 ### END INIT INFO
 . /etc/init.d/functions
 if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then
    exit 0
 fi
 if [ -e /.liveimg-configured ] ; then
    configdone=1
 fi
 exists() {
    which \$1 >/dev/null 2>&1 || return
    \$*
 }
 livedir="LiveOS"
 for arg in \`cat /proc/cmdline\` ; do
  if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
    livedir=\${arg##rd.live.dir=}
    return
  fi
  if [ "\${arg##live_dir=}" != "\${arg}" ]; then
    livedir=\${arg##live_dir=}
    return
  fi
 done
 # enable swaps unless requested otherwise
 swaps=\`blkid -t TYPE=swap -o device\`
 if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
  for s in \$swaps ; do
    action "Enabling swap partition \$s" swapon \$s
  done
 fi
 if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then
  action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
 fi
 mountPersistentHome() {
  # support label/uuid
  if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then
    homedev=\`/sbin/blkid -o device -t "\$homedev"\`
  fi
  # if we're given a file rather than a blockdev, loopback it
  if [ "\${homedev##mtd}" != "\${homedev}" ]; then
    # mtd devs don't have a block device but get magic-mounted with -t jffs2
    mountopts="-t jffs2"
  elif [ ! -b "\$homedev" ]; then
    loopdev=\`losetup -f\`
    if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then
      action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live
    fi
    losetup \$loopdev \$homedev
    homedev=\$loopdev
  fi
  # if it's encrypted, we need to unlock it
  if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then
    echo
    echo "Setting up encrypted /home device"
    plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome"
    homedev=/dev/mapper/EncHome
  fi
  # and finally do the mount
  mount \$mountopts \$homedev /home
  # if we have /home under what's passed for persistent home, then
  # we should make that the real /home.  useful for mtd device on olpc
  if [ -d /home/home ]; then mount --bind /home/home /home ; fi
  [ -x /sbin/restorecon ] && /sbin/restorecon /home
  if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
 }
 findPersistentHome() {
  for arg in \`cat /proc/cmdline\` ; do
    if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
      homedev=\${arg##persistenthome=}
      return
    fi
  done
 }
 if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
  findPersistentHome
 elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then
  homedev=/run/initramfs/live/\${livedir}/home.img
 fi
 # if we have a persistent /home, then we want to go ahead and mount it
 if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then
  action "Mounting persistent /home" mountPersistentHome
 fi
 if [ -n "\$configdone" ]; then
  exit 0
 fi
 # 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
 # Remove root password lock
 passwd -d root > /dev/null
 # turn off firstboot for livecd boots
 systemctl --no-reload disable firstboot-text.service 2> /dev/null || :
 systemctl --no-reload disable firstboot-graphical.service 2> /dev/null || :
 systemctl stop firstboot-text.service 2> /dev/null || :
 systemctl stop firstboot-graphical.service 2> /dev/null || :
 # don't use prelink on a running live image
 sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || :
 # turn off mdmonitor by default
 systemctl --no-reload disable mdmonitor.service 2> /dev/null || :
 systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || :
 systemctl stop mdmonitor.service 2> /dev/null || :
 systemctl stop mdmonitor-takeover.service 2> /dev/null || :
 # don't enable the gnome-settings-daemon packagekit plugin
 gsettings set org.gnome.software download-updates 'false' || :
 # don't start cron/at as they tend to spawn things which are
 # disk intensive that are painful on a live image
 systemctl --no-reload disable crond.service 2> /dev/null || :
 systemctl --no-reload disable atd.service 2> /dev/null || :
 systemctl stop crond.service 2> /dev/null || :
 systemctl stop atd.service 2> /dev/null || :
 # Don't sync the system clock when running live (RHBZ #1018162)
 sed -i 's/rtcsync//' /etc/chrony.conf
 # Mark things as configured
 touch /.liveimg-configured
 # add static hostname to work around xauth bug
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
 # the hostname must be something else than 'localhost'
 # https://bugzilla.redhat.com/show_bug.cgi?id=1370222
 echo "localhost-live" > /etc/hostname
 EOF
 # bah, hal starts way too late
 cat > /etc/rc.d/init.d/livesys-late << EOF
 #!/bin/bash
 #
 # live: Late init script for live image
 #
 # chkconfig: 345 99 01
 # description: Late init script for live image.
 . /etc/init.d/functions
 if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then
    exit 0
 fi
 exists() {
    which \$1 >/dev/null 2>&1 || return
    \$*
 }
 touch /.liveimg-late-configured
 # read some variables out of /proc/cmdline
 for o in \`cat /proc/cmdline\` ; do
    case \$o in
    ks=*)
        ks="--kickstart=\${o#ks=}"
        ;;
    xdriver=*)
        xdriver="\${o#xdriver=}"
        ;;
    esac
 done
 # if liveinst or textinst is given, start anaconda
 if strstr "\`cat /proc/cmdline\`" liveinst ; then
   plymouth --quit
   /usr/sbin/liveinst \$ks
 fi
 if strstr "\`cat /proc/cmdline\`" textinst ; then
   plymouth --quit
   /usr/sbin/liveinst --text \$ks
 fi
 # configure X, allowing user to override xdriver
 if [ -n "\$xdriver" ]; then
   cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE
 Section "Device"
 	Identifier	"Videocard0"
 	Driver	"\$xdriver"
 EndSection
 FOE
 fi
 EOF
 chmod 755 /etc/rc.d/init.d/livesys
 /sbin/restorecon /etc/rc.d/init.d/livesys
 /sbin/chkconfig --add livesys
 chmod 755 /etc/rc.d/init.d/livesys-late
 /sbin/restorecon /etc/rc.d/init.d/livesys-late
 /sbin/chkconfig --add livesys-late
 # enable tmpfs for /tmp
 systemctl enable tmp.mount
@ -297,11 +70,8 @@ EOF
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
@ -326,7 +96,7 @@ rm -f /boot/*-rescue*
 # Disable network service here, as doing it in the services line
 # fails due to RHBZ #1369794
-/sbin/chkconfig network off
+systemctl disable network
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
@ -334,14 +104,3 @@ touch /etc/machine-id
 %end
 %post --nochroot
 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
  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
 fi
 %end
--- a/fedora-live-budgie.ks
+++ b/fedora-live-budgie.ks
@ -0,0 +1,17 @@
 # Description:
 # - Fedora Live Spin with the Budgie Desktop Environment
 # 
 # Maintainer(s):
 # - Joshua Strobl <joshua@buddiesofbudgie.org>
 %include fedora-live-base.ks
 %include fedora-budgie-common.ks
 part / --size 7750
 %post
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="budgie"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-cinnamon.ks
+++ b/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
@ -22,32 +21,8 @@ PREFERRED=/usr/bin/cinnamon-session
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
-cat >> /etc/rc.d/init.d/livesys << EOF
+# set livesys session type
-
+sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys
 # set up lightdm autologin
 sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
 sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
 #sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
 # set Cinnamon as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf
 # no updater applet in live environment
 rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
 # Show harddisk install on the desktop
 sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 # and mark it as executable
 chmod +x /home/liveuser/Desktop/liveinst.desktop
 # this goes at the end after all other changes. 
 chown -R liveuser:liveuser /home/liveuser
 restorecon -R /home/liveuser
 EOF
 %end
--- a/fedora-live-comp_neuro.ks
+++ b/fedora-live-comp_neuro.ks
@ -0,0 +1,12 @@
 # Description: The Workstation based NeuroFedora computational neuroscience lab image.
 # https://fedoraproject.org/wiki/Changes/Comp_Neuro_Lab
 #
 # Maintained by the NeuroFedora SIG:
 # https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org
 %include fedora-live-workstation.ks
 %include fedora-comp-neuro-common.ks
 %include fedora-neuro-gnome-common.ks
 part / --size 10240
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@ -1,72 +1,17 @@
 # fedora-design-suite.ks
 # Based on Live Workstation
-# Description:
+# A collection of applications for professional visual designers
-# - A collection of applications targeted towards professional visual designers
+# http://fedoraproject.org/wiki/Design_Suite
-# Website: http://fedoraproject.org/wiki/Design_Suite
+# Maintained by Luya Tshimbalanga <luya AT fedoraproject DOT org>
-# Maintainer:
+# Credit to Sebastian Dziallas for initiating the project
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Credit to Sebastian Dziallas for initiating the project
 %include fedora-live-workstation.ks
 %include fedora-design-suite-common.ks
 # Size partition
 part / --size 14336
 %packages
 # Switch to groups for design suite
@design-suite
 # Added addons to address rhbz#1336879 from dnf
 gimp-data-extras
 gimp-dbp
 gimp-dds-plugin
 gimp-elsamuko
 gimp-fourier-plugin
 gimp-gap
 gimp-help
 gimp-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
 # Extra wallpapers
 f26-backgrounds-extras-base
 f26-backgrounds-extras-gnome
 # removal of unneeded applications
 -gnome-boxes
 -eog
 -rdesktop
 %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', '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
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
@ -106,6 +51,22 @@ Categories=Documentation;
 FOE
 chmod a+x /usr/share/applications/fedora-design-team.desktop
 # Use Powerline in bash
 cat >>  $HOME/.bashrc << FOE
 # Enable powerline daemon
 if [ -f `which powerline-daemon` ]; then
  powerline-daemon -q
  POWERLINE_BASH_CONTINUATION=1
  POWERLINE_BASH_SELECT=1
  . /usr/share/powerline/bash/powerline.sh
 fi
 FOE
 cat >> /var/lib/livesys/livesys-session-extra << FOE
 #Override the favorite desktop application in Dash
 sed -i "s/favorite-apps=."'*'"/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']/" /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override
 FOE
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
--- a/fedora-live-games.ks
+++ b/fedora-live-games.ks
@ -1,8 +1,19 @@
-# fedora-livedvd-games.ks
+# fedora-live-games.ks
 #
-# Maintainer(s):
+# Maintainers:
 # - Darryl T. Agostinelli <dagostinelli@gmail.com>
 #   https://fedoraproject.org/wiki/User:Dagostinelli
 #
 # - Richard Anaya <richard.anaya@gmail.com>
 #   https://fedoraproject.org/wiki/User:Richardanaya
 #
 # Former Maintainers:
 # - Bruno Wolff III <bruno@wolff.to>
-# - Formerly maintained by Rahul Sundaram
+#   https://fedoraproject.org/wiki/User:Bruno
 #
 # - Rahul Sundaram <sundaram@fedoraproject.org>
 #   https://fedoraproject.org/wiki/User:Sundaram
 #
 %include fedora-live-xfce.ks
@ -37,7 +48,6 @@ asc-music
 astromenace
 # beneath-a-steel-sky-cd scummvm games cut for size
 boswars
 btanks
 bzflag
 crossfire-client
 extremetuxracer
@ -47,21 +57,20 @@ freecol
 freedoom
 freedroidrpg
 frozen-bubble
-gl-117
+# glob2 - currently broken
 glob2
 lincity-ng
-tmw
+#tmw - currently broken
 #maniadrive - currently broken
 #maniadrive-music - has been retired
 megaglest
 nethack-vultures
 netpanzer
-#neverball #cut for size
+neverball
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
 # supertux # Crashing
-#supertuxkart #remove for size
+supertuxkart
 ultimatestunts
 warzone2100
 wesnoth
@ -84,12 +93,11 @@ glaxium
 gnubg
 gnugo
 haxima
-hedgewars
+#hedgewars -- broken
 kcheckers
 knights
 lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
 londonlaw
 lordsawar
 # lure scummvm games cut for size
 # machineball # Would pull in fluid-soundfont-lite-patches
@ -99,9 +107,8 @@ pachi
 pioneers
 quarry
 # Ri-li cut for size
-rogue
+# rogue # recently abandoned. Someone picked it up. Waiting for approval.
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures
 solarwolf
 sopwith
 stormbaancoureur
@ -113,7 +120,6 @@ xblast
 auriferous
 alienblaster
 # duel3 # Would pull in fluid-soundfont-lite-patches
 lmarbles
 powermanga
 # raidem # Would pull in fluid-soundfont-lite-patches
 # raidem-music # Would pull in fluid-soundfont-lite-patches
@ -130,7 +136,6 @@ KoboDeluxe
 Maelstrom
 methane
 njam
 seahorse-adventures
 shippy
 tecnoballz
 wordwarvi
@ -147,14 +152,12 @@ gweled
 # puzzles (big)
 enigma
-fillets-ng
+# fillets-ng # broken in f34
 pingus
 # puzzles (small)
 escape
 # gbrainy Removed for space - only game that pulls in mono
 magicor
 mirrormagic
 pipenightdreams
 pipepanic
@ -164,15 +167,11 @@ vodovod
 # card games
 #poker2d - dropped from F14 for being orphaned
 PySolFC
 # educational/simulation
-bygfoot
+#celestia - not currently building
 celestia
 childsplay
 gcompris
 planets
 tuxpaint
 tuxpaint-stamps
@ -181,16 +180,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.
 -kdegames
 # Nothing should be downloading data to play.
 -autodownloader
--- a/fedora-live-i3.ks
+++ b/fedora-live-i3.ks
@ -0,0 +1,30 @@
 # fedora-livecd-i3.ks
 #
 # Description:
 # - Fedora Live Spin with the tiling window manager i3
 #
 # Maintainer(s):
 # - Nasir Hussain    <nasirhm@fedoraproject.org>
 # - Eduard Lucena    <x3mboy@fedoraproject.org>
 # - Dan Cermak       <defolos@tummy.com>
 # - Justin W. Flory  <jwf@fedoraproject.org>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-i3-common.ks
 %post
 # i3 configuration
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/i3
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="i3"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@ -7,9 +7,7 @@
 # Web: https://fedoraproject.org/wiki/Fedora_jam
 # Web: insert spinspacke when created
-# Maintainer: Jørn Lomax <northlomax@gmail.com>
+# Maintainer: JT Pennington (q5sys) <jt@obs-sec.com>
 #             https://fedoraproject.org/wiki/User:jvlomax
 #             Brendan Jones <brendan.jones.it@gmail.com>
 %include fedora-live-kde.ks
@ -20,123 +18,10 @@ part / --size 10240 --fstype ext4
 bootloader --append="threadirqs"
 %packages
@audio
-#alsa
+#pipewire
-alsa-firmware
+pipewire
 alsa-tools
 alsa-utils
 alsamixergui
 alsa-plugins-jack
 alsa-plugins-pulseaudio
 alsa-plugins-usbstream
 alsa-plugins-samplerate
 alsa-plugins-upmix
 alsa-plugins-vdownmix
 a2jmidid
 aj-snapshot
 #jack 
 jack-audio-connection-kit
 jack-audio-connection-kit-dbus
 qjackctl
 jackctlmmc
 ffado
 #pulse
 pulseaudio-module-jack
 pavucontrol
 #midi
 qsynth
 fluidsynth
 fluid-soundfont-gm
 fluidsynth-dssi
 timidity++
 qmidiarp
 vmpk
 harmonyseq
 #synthesis
 hydrogen
 bristol
 monobristol
 zynaddsubfx
 yoshimi
 swami
 Add64
 synthv1
 samplv1
 drumkv1
 ams
 #guitar
 rakarrack
 guitarix
 tuxguitar
 sooperlooper
 #recodring and DAW
 audacity
 ardour4
 rosegarden4
 seq24
 muse
 qtractor
 non-session-manager
 non-daw
 non-sequencer
 non-mixer
 # audio-plugins
 calf
 dssi
 jack-rack
 ladspa
 #ladpsa plugins
 ladspa-amb-plugins
 ladspa-autotalent-plugins
 ladspa-blop-plugins
 ladspa-cmt-plugins
 ladspa-fil-plugins
 ladspa-mcp-plugins
 ladspa-rev-plugins
 ladspa-swh-plugins
 ladspa-tap-plugins
 ladspa-vco-plugins
 #lv2 plugins
 lv2
 lv2-avw-plugins
 lv2-invada-plugins
 lv2-kn0ck0ut
 lv2-ll-plugins
 lv2-swh-plugins
 lv2-vocoder-plugins
 lv2-zynadd-plugins
 lv2dynparam
 lv2-abGate
 lv2-c++-tools 
 lv2-samplv1
 lv2-synthv1
 lv2-drumkv1
 lv2-triceratops
 lv2-newtonator
 lv2-x42-plugins
 lv2-fomp-plugins
 lv2-sorcer
 lv2-fabla
 lv2-artyfx-plugins
 #dssi
 nekobee-dssi
 whysynth-dssi
 xsynth-dssi
 hexter-dssi
 zynjacku 
 zita-at1
 zita-rev1
 #sound analasys, none of these are packaged yet
 #praat bug_id=666656
@ -147,35 +32,15 @@ emacs
 emacs-color-theme
 vim
 nano
 mscore
 lilypond
 frescobaldi
 mup
 #audio utilities
 jamin
 lash
 jack_capture
 jaaa
 jmeters
 qastools
 arpage
 realTimeConfigQuickScan
 rtirq
 #patchage
 #ladish #not packaged yet
 japa
 radium-compressor
 # fedora jam theming (to be customized)
 kfaenza-icon-theme
 fedora-jam-backgrounds
 fedora-jam-kde-theme
 #Misc. Utils
 screen
 shutter
 -ksnapshot
 multimedia-menus
 kernel-tools
@ -184,33 +49,34 @@ kernel-tools
 firefox
 thunderbird
-#remove packages not need
+#remove packages not needed
-#-kdesdk-umbrello
+-akregator
-#-kdesdk-kcachegrindy
+-kaddressbook
-
+-kmail
-#-kdesdk-kompare
+-kontact
-#-kdepim
+-korganizer
 -non-mixer
 -non-session-manager
 -non-sequencer
 %end
 %post
 # Override livesys-kde settings
 cat >> /var/lib/livesys/livesys-session-extra << EOF
 #setup kickoff favorites
 /bin/mkdir -p /etc/skel/.config
-JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/Kontact.desktop,/usr/share/applications/kde4/ktp-contactlist.desktop
+JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/mozilla-thunderbird.desktop,/usr/share/applications/studio-controls.desktop,/usr/share/applications/ardour6.desktop,/usr/share/applications/carla.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
-cat <<EOF  >> /etc/skel/.config/kickoffrc
+cat <<FOE  >> /etc/skel/.config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
-EOF
+FOE
 # Override fedora-live-kde-base.ks settings
 sed -i /etc/rc.d/init.d/livesys -res"#^(FavoriteURLs=).*#\1${JAMFAVORITESLIVE}#"
 cat >> /etc/rc.d/init.d/livesys << EOF
 /usr/sbin/usermod -a -G jackuser,audio liveuser
 EOF
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@ -19,68 +19,7 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF
 gtk-theme-name = Adwaita
 EOF
-# add initscript
+# set livesys session type
-cat >> /etc/rc.d/init.d/livesys << EOF
+sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys
 # set up autologin for user liveuser
 if [ -f /etc/sddm.conf ]; then
 sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
 sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
 else
 cat > /etc/sddm.conf << SDDM_EOF
 [Autologin]
 User=liveuser
 Session=plasma.desktop
 SDDM_EOF
 fi
 # add liveinst.desktop to favorites menu
 mkdir -p /home/liveuser/.config/
 cat > /home/liveuser/.config/kickoffrc << MENU_EOF
 [Favorites]
 FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 # set executable bit disable KDE security warning
 chmod +x /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
 cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
 # Set akonadi backend
 mkdir -p /home/liveuser/.config/akonadi
 cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 [%General]
 Driver=QSQLITE3
 AKONADI_EOF
 # Disable plasma-pk-updates (bz #1436873 and 1206760)
 echo "Removing plasma-pk-updates package."
 rpm -e plasma-pk-updates
 # Disable baloo
 cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
 [Basic Settings]
 Indexing-Enabled=false
 BALOO_EOF
 # Disable kres-migrator
 cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 [Migration]
 Enabled=false
 KRES_EOF
 # Disable kwallet migrator
 cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
 [Migration]
 alreadyMigrated=true
 KWALLET_EOL
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF
 %end
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@ -11,7 +11,7 @@
 %include fedora-live-minimization.ks
 # DVD payload
-part / --size=6144
+part / --size=8000
 %post
 %end
--- a/fedora-live-lxde.ks
+++ b/fedora-live-lxde.ks
@ -19,46 +19,8 @@ PREFERRED=/usr/bin/startlxde
 DISPLAYMANAGER=/usr/sbin/lxdm
 EOF
-cat >> /etc/rc.d/init.d/livesys << EOF
+# set livesys session type
-# disable screensaver locking and make sure gamin gets started
+sed -i 's/^livesys_session=.*/livesys_session="lxde"/' /etc/sysconfig/livesys
 cat > /etc/xdg/lxsession/LXDE/autostart << FOE
 /usr/libexec/gam_server
@lxpanel --profile LXDE
@pcmanfm --desktop --profile LXDE
 /usr/libexec/notification-daemon
 FOE
 # set up preferred apps 
 cat > /etc/xdg/libfm/pref-apps.conf << FOE 
 [Preferred Applications]
 WebBrowser=firefox.desktop
 MailClient=sylpheed.desktop
 FOE
 # set up auto-login for liveuser
 sed -i 's/# autologin=.*/autologin=liveuser/g' /etc/lxdm/lxdm.conf
 # Show harddisk install on the desktop
 sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 # create default config for clipit, otherwise it displays a dialog on startup
 mkdir -p /home/liveuser/.config/clipit
 cat > /home/liveuser/.config/clipit/clipitrc  << FOE
 [rc]
 use_copy=true
 save_uris=true
 save_history=false
 statics_show=true
 single_line=true
 FOE
 # this goes at the end after all other changes.
 chown -R liveuser:liveuser /home/liveuser
 restorecon -R /home/liveuser
 EOF
 %end
--- a/fedora-live-lxqt.ks
+++ b/fedora-live-lxqt.ks
@ -11,41 +11,13 @@
 %include fedora-live-minimization.ks
 %include fedora-lxqt-common.ks
 %packages
 dracut-config-generic
 %end
 %post
-# add initscript
+# set livesys session type
-cat >> /etc/rc.d/init.d/livesys << EOF
+sed -i 's/^livesys_session=.*/livesys_session="lxqt"/' /etc/sysconfig/livesys
 # set up autologin for user liveuser
 if [ -f /etc/sddm.conf ]; then
 sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
 sed -i 's/^#Session=.*/Session=lxqt.desktop/' /etc/sddm.conf
 else
 cat > /etc/sddm.conf << SDDM_EOF
 [Autologin]
 User=liveuser
 Session=lxqt.desktop
 SDDM_EOF
 fi
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
 cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
 # set up preferred apps 
 cat > /etc/xdg/libfm/pref-apps.conf << FOE 
 [Preferred Applications]
 WebBrowser=qupzilla.desktop
 FOE
 # no updater applet in live environment
 rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF
 %end
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@ -7,45 +7,10 @@
 %include fedora-mate-common.ks
 %include fedora-live-minimization.ks
-part / --size 6144
+part / --size 8192
 %post
-cat >> /etc/rc.d/init.d/livesys << EOF
+# set livesys session type
-
+sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys
 # make the installer show up
 if [ -f /usr/share/applications/liveinst.desktop ]; then
  # Show harddisk install in shell dash
  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
 fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 # and mark it as executable
 chmod +x /home/liveuser/Desktop/liveinst.desktop
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 # set up lightdm autologin
 sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
 sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
 #sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
 # set MATE as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=mate/' /etc/lightdm/lightdm.conf
 # Turn off PackageKit-command-not-found while uninstalled
 if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
 fi
 # no updater applet in live environment
 rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF
 %end
--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@ -4,19 +4,6 @@
 %packages
 # 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
 -xsane-gimp
 -sane-backends
 %end
--- a/fedora-live-python-classroom.ks
+++ b/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 8192
--- a/fedora-live-robotics.ks
+++ b/fedora-live-robotics.ks
@ -1,5 +1,6 @@
-# Maintained by the Fedora Robotics SIG:
+# Maintained by x3mboy and the Fedora Robotics SIG:
-# http://fedoraproject.org/wiki/SIGs/Robotics
+# https://fedoraproject.org/wiki/SIGs/Robotics
 # mailto:x3mboy@fedoraproject.org
 # mailto:robotics@lists.fedoraproject.org
 %include fedora-live-base.ks
@ -10,7 +11,8 @@ part / --size 10752
 %packages
 # Start with GNOME
-@gnome-desktop
+# Install workstation-product-environment to resolve RhBug:1891500
@^workstation-product-environment
 # Add robotics development packages
@robotics-suite
@ -27,9 +29,13 @@ mercurial
 -@graphical-internet
 -@games
 -@sound-and-video
-
+-@dial-up
-# Add a web browser
+-@input-methods
-firefox
+-@standard
 -@container-management
 -@libreoffice
 -@networkmanager-submodules
 -@workstation-product
 # Remove office suite
 -libreoffice-*
@ -41,13 +47,14 @@ firefox
 # Drop things that pull in perl
 -linux-atm
-# No printing
+# No printing or scanning
 -foomatic-db-ppds
 -foomatic
 -sane-backends-drivers-scanners
 -libsane-hpaio
 # Dictionaries are big
 -aspell-*
 -hunspell-*
 -man-pages*
 -words
@ -61,7 +68,6 @@ firefox
 -krb5-auth-dialog
 -krb5-workstation
 -pam_krb5
 -quota
 -nano
 -dos2unix
 -finger
@ -70,10 +76,8 @@ firefox
 -mtr
 -pinfo
 -rsh
 -nfs-utils
 -ypbind
 -yp-tools
 -rpcbind
 -acpid
 -ntsysv
@ -86,9 +90,9 @@ firefox
 %end
 # Rip the post-configuration from the live-desktop, set default shortcuts to IDEs 
 %post
-cat >> /etc/rc.d/init.d/livesys << EOF
+# Extend the post-configuration from the live-desktop, set default shortcuts to IDEs
 cat >> /var/lib/livesys/livesys-session-extra << EOF
 # disable screensaver locking
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
 [org.gnome.desktop.screensaver]
@ -101,12 +105,6 @@ cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override <
 disable-lock-screen=true
 FOE
 # disable updates plugin
 cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
 [org.gnome.software]
 download-updates=false
 FOE
 # make the installer show up
 if [ -f /usr/share/applications/liveinst.desktop ]; then
  # Show harddisk install in shell dash
@ -116,7 +114,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'eclipse.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'org.qt-project.qtcreator.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
 FOE
 fi
@ -124,17 +122,5 @@ fi
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 # set up auto-login
 cat > /etc/gdm/custom.conf << FOE
 [daemon]
 AutomaticLoginEnable=True
 AutomaticLogin=liveuser
 FOE
 # Turn off PackageKit-command-not-found while uninstalled
 if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
 fi
 EOF
 %end
--- a/fedora-live-scientific_kde.ks
+++ b/fedora-live-scientific_kde.ks
@ -8,167 +8,12 @@
 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
-%include fedora-live-kde.ks
+%include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
 %include fedora-scientific-common.ks
 # The recommended part size for DVDs is too close to use for the scientific spin
-part / --size 14500
+part / --size 15000
 %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
--- a/fedora-live-security.ks
+++ b/fedora-live-security.ks
@ -6,6 +6,7 @@
 # Maintainers:
 #   Fabian Affolter <fab [AT] fedoraproject <dot> org>
 #   Joerg Simon <jsimon [AT] fedoraproject <dot> org>
 #   JT Pennington <jt [AT] fedoraproject <dot> org>
 # Acknowledgements:
 #   Fedora LiveCD Xfce Spin team - some work here was and will be inherited,
 #   many thanks, especially to Christoph Wickert!
@ -21,7 +22,9 @@
 part / --size 10240
 %packages
-@xfce-desktop
+# install env-group to resolve RhBug:1891500
@^xfce-desktop-environment
@xfce-apps
 # Security tools
@ -36,8 +39,7 @@ gnome-keyring-pam
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
-realmd                     # only seems to be used in GNOME
+-PackageKit*                # we switched to dnfdragora, so we don't need this
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
 -gnumeric
 -foomatic-db-ppds
@ -100,50 +102,7 @@ PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
-cat >> /etc/rc.d/init.d/livesys << EOF
+# set livesys session type
-
+sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
 mkdir -p /home/liveuser/.config/xfce4
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
 FileManager=Thunar
 WebBrowser=midori
 FOE
 # disable screensaver locking (#674410)
 cat >> /home/liveuser/.xscreensaver << FOE
 mode:           off
 lock:           False
 dpmsEnabled:    False
 FOE
 # deactivate xfconf-migration (#683161)
 rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
 # deactivate xfce4-panel first-run dialog (#693569)
 mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml
 cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 # set up lightdm autologin
 sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
 sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
 #sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
 # set Xfce as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf
 # Show harddisk install on the desktop
 sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 # and mark it as executable (new Xfce security feature)
 chmod +x /home/liveuser/Desktop/liveinst.desktop
 # this goes at the end after all other changes. 
 chown -R liveuser:liveuser /home/liveuser
 restorecon -R /home/liveuser
 EOF
 %end
--- a/fedora-live-soas.ks
+++ b/fedora-live-soas.ks
@ -4,9 +4,8 @@
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
-# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
-# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Alex Perez <aperez AT alexperez DOT com>
 # - Mel Chua <mchua AT fedoraproject DOT org>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
@ -14,37 +13,7 @@
 %post
-cat >> /etc/rc.d/init.d/livesys << EOF
+# set livesys session type
-# set up lightdm autologin
+sed -i 's/^livesys_session=.*/livesys_session="soas"/' /etc/sysconfig/livesys
 sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
 sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
 #sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
 # set Sugar as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
 EOF
 cat >> /etc/rc.d/init.d/livesys-late << EOF
 # disable screensaver locking
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
 [org.gnome.desktop.screensaver]
 lock-enabled=false
 FOE
 # and hide the lock screen option
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
 [org.gnome.desktop.lockdown]
 disable-lock-screen=true
 FOE
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 EOF
 chmod 755 /etc/rc.d/init.d/livesys-late
 /sbin/restorecon /etc/rc.d/init.d/livesys-late
 /sbin/chkconfig --add livesys-late
 %end
--- a/fedora-live-sway.ks
+++ b/fedora-live-sway.ks
@ -0,0 +1,32 @@
 # fedora-livecd-sway.ks
 #
 # Description:
 # - Fedora Live Spin with the tiling window manager Sway
 #
 # Maintainer(s):
 # - Aleksei Bavshin         <alebastr89@gmail.com>
 # - Jiří Konečný            <jkonecny@redhat.com>
 # - Anthony Rabbito         <hello@anthonyrabbito.com>
 # - Fabio Alessandro Locati <me@fale.io>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-sway-common.ks
 %packages
 # To be able to show installation instructions on background
 nwg-wrapper
 %end
 %post
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/sway
 DISPLAYMANAGER=/bin/sddm
 EOF
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="sway"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@ -10,67 +10,11 @@
 #
 #include snippets/packagekit-cached-metadata.ks
-part / --size 6656
+part / --size 7750
 %post
-cat >> /etc/rc.d/init.d/livesys << EOF
+# set livesys session type
-
+sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys
 # 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 run gnome-initial-setup
 mkdir ~liveuser/.config
 touch ~liveuser/.config/gnome-initial-setup-done
 # make the installer show up
 if [ -f /usr/share/applications/liveinst.desktop ]; then
  # Show harddisk install in shell dash
  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
  # need to move it to anaconda.desktop to make shell happy
  mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
 favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
 FOE
  # Make the welcome screen show up
  if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
    mkdir -p ~liveuser/.config/autostart
    cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
  fi
  # Copy Anaconda branding in place
  if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
    cp -a /usr/share/lorax/product/* /
  fi
 fi
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 # set up auto-login
 cat > /etc/gdm/custom.conf << FOE
 [daemon]
 AutomaticLoginEnable=True
 AutomaticLogin=liveuser
 FOE
 # Turn off PackageKit-command-not-found while uninstalled
 if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
 fi
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF
 %end
--- a/fedora-live-xfce.ks
+++ b/fedora-live-xfce.ks
@ -13,6 +13,9 @@
 %include fedora-live-minimization.ks
 %include fedora-xfce-common.ks
 # need a bigger /
 part / --size 6144
 %post
 # xfce configuration
@ -23,51 +26,8 @@ PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
-cat >> /etc/rc.d/init.d/livesys << EOF
+# set livesys session type
-
+sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
 mkdir -p /home/liveuser/.config/xfce4
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
 FileManager=Thunar
 WebBrowser=firefox
 FOE
 # disable screensaver locking (#674410)
 cat >> /home/liveuser/.xscreensaver << FOE
 mode:           off
 lock:           False
 dpmsEnabled:    False
 FOE
 # deactivate xfconf-migration (#683161)
 rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
 # deactivate xfce4-panel first-run dialog (#693569)
 mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml
 cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 # set up lightdm autologin
 sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
 sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
 #sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
 # set Xfce as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf
 # Show harddisk install on the desktop
 sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 # and mark it as executable (new Xfce security feature)
 chmod +x /home/liveuser/Desktop/liveinst.desktop
 # this goes at the end after all other changes. 
 chown -R liveuser:liveuser /home/liveuser
 restorecon -R /home/liveuser
 EOF
 %end
--- a/fedora-lxde-common.ks
+++ b/fedora-lxde-common.ks
@ -8,11 +8,12 @@
 %packages
 ### LXDE desktop
-@lxde-desktop
+# install env-group to resolve RhBug:1891500
@^lxde-desktop-environment
@lxde-apps
@lxde-media
@lxde-office
@networkmanager-submodules
 # FIXME: can be omitted once comps is updated
 midori
@ -39,11 +40,12 @@ metacity
 #-words
 # save some space
 -@admin-tools
 -autofs
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
-PackageKit*                # we switched to yumex, so we don't need this
+-PackageKit*                # we switched to dnfdragora, so we don't need this
 -foomatic-db-ppds
 -foomatic
 -stix-fonts
--- a/fedora-lxqt-common.ks
+++ b/fedora-lxqt-common.ks
@ -5,20 +5,22 @@
 #
 # Maintainer(s):
 # – Christian Dersch <lupinix@fedoraproject.org>
 # – Zamir SUN <zsun@fedoraproject.org>
 #
 %packages
-@lxqt
+# install env-group to resolve RhBug:1891500
@^lxqt-desktop-environment
@lxqt-apps
@lxqt-media
@networkmanager-submodules
 # for nm applet
 gnome-keyring
 # l10n
-lxqt-l10n
+@lxqt-l10n
 lximage-qt-l10n
 obconf-qt-l10n
 pavucontrol-qt-l10n
@ -26,6 +28,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:
@ -34,14 +39,16 @@ wqy-microhei-fonts          # a compact CJK font, to replace:
 -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
+-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge
 #-stix-fonts        # mathematical symbols
 # remove input methods to free space
 -@input-methods
 -@admin-tools
 -scim*
 -m17n*
-ibus*
+# Temporary include ibus to workaround RHBZ 1633225
 # -ibus*
 -iok
 # Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132
--- a/fedora-mate-common.ks
+++ b/fedora-mate-common.ks
@ -1,7 +1,8 @@
 %packages
-PackageKit*                # we switched to yumex, so we don't need this
+# install env-group to resolve RhBug:1891500
-firefox
+@^mate-desktop-environment
-@mate
+
 fedora-release-matecompiz
 compiz
 compiz-plugins-main
 compiz-plugins-extra
@ -15,52 +16,38 @@ simple-ccsm
 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
 # see https://bugzilla.redhat.com/show_bug.cgi?id=2068699
 # and https://bugzilla.redhat.com/show_bug.cgi?id=1933494
 # use earlyoom instead of systemd-oomd-defaults
 earlyoom
 -systemd-oomd-defaults
 # office
@libreoffice
 # dsl tools
 rp-pppoe
 # some tools
 p7zip
 p7zip-plugins
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns
 # Drop things for size
 -@3d-printing
 -@admin-tools
 -brasero
 -colord
 -fedora-icon-theme
 -gnome-icon-theme
 -gnome-icon-theme-symbolic
 -gnome-logs
 -gnome-software
 -gnome-user-docs
 -@mate-applications
 -mate-icon-theme-faenza
 # Help and art can be big, too
 -gnome-user-docs
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@ -1,8 +1,13 @@
 %packages
 microdnf
 -@standard
 -initial-setup-gui
 -generic-release*
 -glibc-all-langpacks
 # recommended by iproute, we don't want it in minimal
 -iproute-tc
 # recommended by gnutls, we don't want it in minimal
 -trousers
 glibc-langpack-en
 iw
 NetworkManager-wifi
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@ -2,12 +2,12 @@ text
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 # Disabled for modular compose (for now)
 #firewall --enabled --service=mdns
 # Disabled for modular compose (for now)
-#services --enabled=sshd,NetworkManager,chronyd,initial-setup
+#services --enabled=sshd,chronyd,initial-setup
 services --enabled=NetworkManager
 network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
@ -35,9 +35,8 @@ microdnf
 glibc-minimal-langpack
 grubby
 kernel
 libcrypt
 sssd-client
-dhcp-client
+@networkmanager-submodules
 -fedora-logos
 -coreutils
 -dosfstools
@ -55,15 +54,17 @@ dhcp-client
 %post
 # Find the architecture we are on
 arch=$(uname -m)
 # Setup Raspberry Pi firmware
-#cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
+if [[ $arch == "aarch64" ]]; then
-mv -f /boot/efi/config-64.txt /boot/efi/config.txt
+cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+fi
-releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
+releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
-rpm -qa
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
--- a/fedora-modular-docker-base-minimal.ks
+++ b/fedora-modular-docker-base-minimal.ks
@ -1,70 +0,0 @@
 # 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
--- a/fedora-neuro-gnome-common.ks
+++ b/fedora-neuro-gnome-common.ks
@ -0,0 +1,30 @@
 # Description: Common gnome based configuration for NeuroFedora spin images.
 #
 # Maintained by the NeuroFedora SIG:
 # https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org
 # Please specify the individual package sets in their own ks files:
 # - fedora-comp-neuro-common.ks
 %packages
@firefox
 # Editors
 emacs
 vim-X11
 # This is no longer workstation
 -@workstation-product
 # No Workstation backgrounds
 #-desktop-backgrounds-basic
 #-*backgrounds-extras
 %end
 %post
 #Override the favorite desktop application in Dash
 sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'anaconda.desktop']/" /etc/rc.d/init.d/livesys
 %end
--- a/fedora-phosh-common.ks
+++ b/fedora-phosh-common.ks
@ -0,0 +1,13 @@
 # fedora-phosh-common.ks
 #
 # Description:
 # - Fedora Disk image Spin with the phosh window manager
 #
 # Maintainer(s):
 # - Kevin Fenzi       <kevin@scrye.com>
 %packages
 # install env-group to resolve RhBug:1891500
@^phosh-desktop-environment
 %end
--- a/fedora-python-classroom-common.ks
+++ b/fedora-python-classroom-common.ks
@ -13,10 +13,33 @@ vim-enhanced
 wget
 # Remove Pythons possibly recommended by tox
 -python2
 -python26
 -python27
 -python33
 -python34
 -python35
 -python36
 -python37
 -python38
 -python2.7
 -python3.5
 -python3.6
 -python3.7
 -python3.8
 -python3.9
 -python3.10
 -pypy
 # Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450
 #               and https://bugzilla.redhat.com/show_bug.cgi?id=1902354
 -texlive-base
 -texlive-latex
 # Remove gdal recommended by networkx, brings in close to 600M of proj data
 # Also explicitly list proj to make sure both packages are gone
 # https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/LGC5IMMHZ4DM7GQNPAFC6GU362PPTN7O/
 -python3-gdal
 -proj
 %end
--- a/fedora-python-classroom-gnome-common.ks
+++ b/fedora-python-classroom-gnome-common.ks
@ -7,7 +7,6 @@
 %include fedora-python-classroom-common.ks
 %packages
 ninja-ide
 emacs
 python3-matplotlib-tk
 python3-pillow-tk
@ -18,7 +17,6 @@ python3-pillow-tk
 -@sound-and-video
 -@multimedia
 -dleyna*
 -evolution*
 -gnome-boxes
 -gnome-calendar
 -gnome-clocks
@ -27,6 +25,7 @@ python3-pillow-tk
 -gnome-documents
 -gnome-font-viewer
 -gnome-maps
 -gnome-photos
 -gnome-weather
 -grilo-plugins
 -cheese
@ -35,7 +34,9 @@ python3-pillow-tk
 # This is no longer workstation
 -@workstation-product
-fedora-productimg-workstation
+
 # But we want to keep the Fedora desktop backgrounds
 desktop-backgrounds-gnome
 # Add a web browser
@firefox
@ -47,7 +48,7 @@ python3-pillow-tk
 # Drop the Java plugin and Java
 -icedtea-web
-java*
+-*openjdk*
 # No printing
 -@printing
@ -92,6 +93,9 @@ python3-pillow-tk
 -system-config-services
 -policycoreutils-gui
 # Inkscape is too big to be included
 -inkscape
 %end
--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented
 # For the master branch the following should be uncommented
-# %include fedora-repo-rawhide.ks
+%include fedora-repo-rawhide.ks
 # For non-master branches the following should be uncommented
-%include fedora-repo-not-rawhide.ks
+# %include fedora-repo-not-rawhide.ks
--- a/fedora-scientific-common.ks
+++ b/fedora-scientific-common.ks
@ -0,0 +1,141 @@
 %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-qt5
 python3-matplotlib-tk
 # Include Java development tools
@java-development
 apache-commons-math
 #fortran compiler
 gcc-gfortran
 # GUI for R
 rkward
 # julia
 julia
 julia-doc
 julia-devel
 python3-spyder
 python3-spyder-kernels
 #writing & publishing
 emacs
 emacs-color-theme
 vim
 scribus
 #scite
 lyx
 kile
 #Presentation, Bibliography & Document arrangement 
 #tools
 BibTool
 pdfshuffler
 # Parallel/Distributed computing libraries/tools
 openmpi
 openmpi-devel
 valgrind-openmpi
 libgomp
 python3-mpi4py-openmpi
 python3-mpi4py-mpich
 #Version control- a GUI for each as well
 # Installing rapidsvn will also install subversion package
 rapidsvn 
 git
 git-gui
 # Mercurial
 mercurial
 mercurial-hgk
 #Backup Utilities
 backintime-kde
 #needs to install this specifically because of some conflict between openmpi
 #and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
 libotf
 #root
 root
 root-gui-fitpanel
 #Multiple jobs/clustering system
 # torque
 # torque-server
 # torque-scheduler
 # torque-gui
 # torque-libs
 # torque-mom
 # python-pbs
 #Drawing, Picture viewing tools, Visualization tools
 dia
 inkscape
 xzgv
 gimp
 ## ggobi
 ## ggobi-devel
 #g3data
 #Mayavi
 #Misc. Utils
 screen
 tmux
 rlwrap
 hexchat
 fig2ps
 hevea
 #Include Mozilla Firefox
 firefox
 %end
--- a/fedora-scientific-vagrant.ks
+++ b/fedora-scientific-vagrant.ks
@ -0,0 +1,12 @@
 # Fedora Scientific  Vagrant box
 # Fedora Scientific: For researchers in Science and Engineering
 # Fedora-Scientific aims to create a Fedora which has the generic
 # toolset for the researcher
 # Web: https://labs.fedoraproject.org/en/scientific/
 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
 %include fedora-cloud-base-vagrant.ks
 %include fedora-scientific-common.ks
--- a/fedora-server-vm-full.ks
+++ b/fedora-server-vm-full.ks
@ -0,0 +1,201 @@
 # fedora-server-vm-full.ks (rel. 1.01)
 # Kickstart file to build a Fedora Server Edition VM disk image.
 # The image aims to resemble as close as technically possible the
 # full features of a Fedora Server Edition in a virtual machine.
 #
 # The image uses GPT partition type as of default in Fedora 37.
 #
 # At first boot it opens a text mode basic configuration screen.
 #
 # This kickstart file is designed to be used with ImageFactory (in Koji).
 #
 # To build the image locally, you need to install ImageFactory and
 # various additional helpers and configuration files.
 # See Fedora Server Edition user documentation tutorial.
 # Use text mode install
 text
 # Keyboard layouts
 keyboard 'us'
 # System language
 lang en_US.UTF-8
 # System timezone
 # set time zone to GMT (Etcetera/UTC)
 timezone Etc/UTC --utc
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
 selinux --enforcing
 # System bootloader configuration
 bootloader --location=mbr --timeout=1 --append="console=tty1 console=ttyS0,115200n8"
 # Network information
 network  --bootproto=dhcp --device=link --activate --onboot=on
 # Firewall configuration
 firewall --enabled --service=mdns
 # System services
 services --enabled="sshd,NetworkManager,chronyd,initial-setup"
 # Run the Setup Agent on first boot
 firstboot --reconfig
 # Partition Information. Use GPT by default (since Fedora 37)
 # Resemble the Partitioning used for Fedora Server Install media
 clearpart --all --initlabel --disklabel=gpt
 reqpart --add-boot
 part pv.007     --size=4000  --grow
 volgroup  sysvg  pv.007
 logvol / --vgname=sysvg --size=4000 --grow --maxsize=16000 --fstype=xfs --name=root --label=sysroot
 # Include URLs for network installation dynamically, dependent on Fedora release
 # and imagefactory runtime environment
 %include fedora-repo.ks
 # Shutdown after installation
 shutdown
 ##### begin package list #############################################
 %packages --inst-langs=en
@server-product
@core
@headless-management
@standard
@networkmanager-submodules
 # container management is an optional install item on disk media.
 # Install options not available with VMs. So we don't include it
 # despite trying to resemble a DVD installation as close as possible.
 ##@container-management
@domain-client
@guest-agents
 # All arm-tools packages install on aarch64/armhfp only
 # TODO: on a x86_64 devel environment are @arm-tools not available
 # and cause a build error.
 # @arm-tools
 # Standard Fedora Package Groups
 ## dracut-config-generic  ## included in =core=
 glibc-all-langpacks
 initial-setup
 kernel-core
 -dracut-config-rescue
 -generic-release*
 -initial-setup-gui
 -kernel
 -linux-firmware
 -plymouth
 # pulled in by @standard
 -smartmontools
 -smartmontools-selinux
 %end
 ##### end package list ###############################################
 ##### begin kickstart post script ####################################
 %post --erroronfail  --log=/root/anaconda-post-1.log
 # Find the architecture we are on
 arch=$(uname -m)
 # Import RPM GPG key, during installation saved in /etc/pki
 echo "Import RPM GPG key"
 releasever=$(rpm --eval '%{fedora}')
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 # See the systemd-random-seed.service man page that says:
 #   " It is recommended to remove the random seed from OS images intended
 #     for replication on multiple systems"
 # The newly installed instance should make it's own
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/systemd/random-seed
 # When we build the image a networking config file gets left behind.
 # Let's clean it up.
 echo "Cleanup leftover networking configuration"
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
 # Truncate the /etc/resolv.conf left over from NetworkManager during the
 # kickstart because the DNS server is environment specific.
 truncate -s 0 /etc/resolv.conf
 echo "Cleaning repodata to save space."
 dnf clean all
 # linux-firmware is installed by default and is quite large. As of mid 2020:
 #   Total download size: 97 M
 #   Installed size: 268 M
 # Not needed in virtual environment.
 echo "Removing linux-firmware package."
 rpm -e linux-firmware
 # Will ever anybody see this?
 echo "Packages within this disk image"
 rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 # Do we need a serial terminal with a VM?
 if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 # Anaconda adds console=tty0 to the grub boot line on all images. this is problematic
 # when you are using fedora via serial console as you do not get any output post grub
 # linux does a good job of knowing what consoles need to be enabled.
 # https://bugzilla.redhat.com/show_bug.cgi?id=2022757
 sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
 fi
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 %end
 ##### end kickstart post script #####################################
 ##### begin custom post script (after base) #########################
 %post
 echo "Zeroing out empty space."
 # Create zeros file with nodatacow and no compression
 touch /var/tmp/zeros
 chattr +C /var/tmp/zeros
 # This forces the filesystem to reclaim space from deleted files
 dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 echo "(Don't worry -- that out-of-space error was expected.)"
 # Force sync to disk
 sync /
 rm -f /var/tmp/zeros
 sync /
 # 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 .
 # When we build the image /var/log gets populated.
 # Let's clean it up.
 echo "Cleanup leftover in /var/log"
 rm -rf /var/log/*
 %end
 ##### end custom post script ########################################
--- a/fedora-soas-common.ks
+++ b/fedora-soas-common.ks
@ -4,11 +4,20 @@
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
-# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
 # - Alex Perez <aperez AT alexperez DOT com>
 firewall --enabled --service=mdns,presence
 %packages
 # install env-group to resolve RhBug:1891500
@^sugar-desktop-environment
 # == Core Sugar Platform ==
 fedora-release-soas
 # explicitly remove a bunch of extra stuff
 -openbox
 -@fonts
 -@dial-up
 -@multimedia
@ -30,8 +39,11 @@ firewall --enabled --service=mdns,presence
 -abrt-cli
 -ibus*
 -hyperv-daemons
-webkitgtk4-plugin-process-gtk2
+-sane-backends
-webkitgtk3
+-sane-backends-drivers-scanners
 -dhcp-client
 -gcc-gdb-plugin
 -gcc
 # Add some extra fonts
 dejavu-sans-fonts
@ -41,102 +53,36 @@ aajohan-comfortaa-fonts
 sil-abyssinica-fonts
 vlgothic-fonts
 # == Core Sugar Platform ==
@sugar-desktop
 -sugar-ruler
 sugar-cp-updater
 lightdm
 lightdm-gtk
 # Write breaks unless we do this (we don't need it anyway)
 # enable for testing in the F17 dev cycle
@input-methods
 # Needed for wifi, bluetooth and WWAN connection support
@networkmanager-submodules
 # == Platform Components ==
 # from http://wiki.sugarlabs.org/go/0.94/Platform_Components
 alsa-plugins-pulseaudio
 alsa-utils
 gstreamer1-plugins-base
 gstreamer1-plugins-good
 gstreamer1-plugins-bad-free
 gstreamer-plugins-espeak
 pulseaudio
 pulseaudio-utils
 # explicitly remove openbox and hopefully deal with what firstboot wants
 -openbox
 # remove deps that come from god knows where
 -sane-backends
 -sane-backends-drivers-scanners
 # Usefulness for DSL connections as per:
 # http://bugs.sugarlabs.org/ticket/1951
 rp-pppoe
 # Useful for SoaS duplication from:
 # http://bugs.sugarlabs.org/ticket/74
 livecd-tools
 # Get the Sugar boot screen
 -plymouth-system-theme
 -plymouth-theme-charge
 sugar-logos
 %end
 %post
 # Rebuild initrd for Sugar boot screen
 KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
 /usr/sbin/plymouth-set-default-theme sugar
 /sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
 Sugar on a Stick
 EOF
 cat /etc/fedora-release >> /boot/olpc_build
-# Add our activities to the favorites
+# Rebuild initrd for Sugar boot screen
-cat > /usr/share/sugar/data/activities.defaults << EOF
+KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-org.laptop.WebActivity
+/usr/sbin/plymouth-set-default-theme sugar
-org.laptop.HelpActivity
+sed -i -r 's/(omit_dracutmodules\+\=.*) plymouth (.*)/\1 \2/' /etc/dracut.conf.d/99-liveos.conf
-org.laptop.Chat
+dracut --force-add plymouth -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
-org.laptop.sugar.ReadActivity
+
-org.laptop.sugar.GetBooksActivity
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
-org.laptop.AbiWordActivity
+rm -f /var/lib/rpm/__db*
 org.laptop.TurtleArtActivity
 org.laptop.Calculate
 org.laptop.Clock
 org.laptop.ImageViewerActivity
 org.laptop.Memorize
 org.laptop.physics
 org.laptop.Pippy
 org.laptop.RecordActivity
 org.laptop.Oficina
 org.laptop.StopWatchActivity
 org.laptop.community.Finance
 org.laptop.community.TypingTurtle
 org.laptop.sugar.Jukebox
 org.laptop.Words
 org.eq.FotoToon
 org.gnome.Labyrinth
 com.laptop.Ruler
 org.sugarlabs.AbacusActivity
 org.sugarlabs.IRC
 org.sugarlabs.InfoSlicer
 org.sugarlabs.PortfolioActivity
 org.sugarlabs.StoryActivity
 org.sugarlabs.VisualMatchActivity
 com.garycmartin.Moon
 mulawa.Countries
 tv.alterna.Clock
 vu.lux.olpc.Maze
 vu.lux.olpc.Speak
 EOF
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/sugar
@ -160,6 +106,18 @@ 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
 %post --nochroot
 for n in initramfs initrd; do
    for img in "$LIVE_ROOT/images/pxeboot/$n"* ; do
        [ -e "$img" ] && cp -a "$INSTALL_ROOT"/boot/initramfs-*.img "$img"
    done
 done
 %end
--- a/fedora-sway-common.ks
+++ b/fedora-sway-common.ks
@ -0,0 +1,17 @@
 # fedora-livecd-sway.ks
 #
 # Description:
 # - Fedora Live Spin with the tiling window manager Sway
 #
 # Maintainer(s):
 # - Aleksei Bavshin         <alebastr89@gmail.com>
 # - Jiří Konečný            <jkonecny@redhat.com>
 # - Anthony Rabbito         <hello@anthonyrabbito.com>
 # - Fabio Alessandro Locati <me@fale.io>
 %packages
 fedora-release-sway
@^sway-desktop-environment
@firefox
@swaywm-extended
 %end
--- a/fedora-workstation-common.ks
+++ b/fedora-workstation-common.ks
@ -5,23 +5,8 @@
 -@input-methods
 -@standard
-# Make sure to sync any additions / removals done here with
+# Install workstation-product-environment to resolve RhBug:1891500
-# workstation-product-environment in comps
+@^workstation-product-environment
@base-x
@core
@firefox
@fonts
@gnome-desktop
@guest-desktop-agents
@hardware-support
@libreoffice
@multimedia
@networkmanager-submodules
@printing
@workstation-product
 # Branding for the installer
 fedora-productimg-workstation
 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
--- a/fedora-xfce-common.ks
+++ b/fedora-xfce-common.ks
@ -4,33 +4,22 @@
 # - Fedora Live Spin with the light-weight XFCE Desktop Environment
 #
 # Maintainer(s):
 # - Rahul Sundaram    <sundaram@fedoraproject.org>
 # - Christoph Wickert <cwickert@fedoraproject.org>
 # - Kevin Fenzi       <kevin@tummy.com>
 # - Adam Miller       <maxamillion@fedoraproject.org>
-
+# - Mukundan Ragavan  <nonamedotc@fedoraproject.org>
 %packages
-@networkmanager-submodules
+fedora-release-xfce
-@xfce-desktop
+# install env-group to resolve RhBug:1891500
@^xfce-desktop-environment
@xfce-apps
@xfce-extra-plugins
@xfce-media
@xfce-office
 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
 # Admin tools are handy to have
@admin-tools
 # Add some screensavers, people seem to like them
 # Note that blank is still default.
 xscreensaver-extras
 wget
 # Handy for debugging
 rfkill
 # Better more popular browser
 firefox
 system-config-printer
 # save some space
@ -38,8 +27,8 @@ 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
 -xfce4-eyes-plugin
 %end
--- a/l10n/fedora-live-workstation-de_CH.ks
+++ b/l10n/fedora-live-workstation-de_CH.ks
@ -11,7 +11,7 @@ timezone Europe/Zurich
 %packages
 -gnome-blog
-@german-support
+langpacks-de
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-de_DE.ks
+++ b/l10n/fedora-live-workstation-de_DE.ks
@ -11,7 +11,7 @@ timezone Europe/Berlin
 %packages
 -gnome-blog
-@german-support
+langpacks-de
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-fr_FR.ks
+++ b/l10n/fedora-live-workstation-fr_FR.ks
@ -13,7 +13,7 @@ keyboard fr-latin9
 timezone Europe/Paris
 %packages
-@french-support
+langpacks-fr
 # exclude input methods:
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-ja_JP.ks
+++ b/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
--- a/l10n/fedora-live-workstation-nl_NL.ks
+++ b/l10n/fedora-live-workstation-nl_NL.ks
@ -10,7 +10,7 @@ keyboard us
 timezone Europe/Amsterdam
 %packages
-@dutch-support
+langpacks-nl
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-pt_BR.ks
+++ b/l10n/fedora-live-workstation-pt_BR.ks
@ -10,7 +10,7 @@ keyboard br-abnt2
 timezone America/Sao_Paulo
 %packages
-@brazilian-support
+langpacks-pt_BR
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-pt_PT.ks
+++ b/l10n/fedora-live-workstation-pt_PT.ks
@ -10,7 +10,7 @@ keyboard pt-latin1
 timezone Europe/Lisbon
 %packages
-@portuguese-support
+langpacks-pt
 # exclude input methods
 -m17n*
 -scim*
--- a/l10n/fedora-live-workstation-ru_RU.ks
+++ b/l10n/fedora-live-workstation-ru_RU.ks
@ -10,7 +10,7 @@ keyboard ru
 timezone Europe/Moscow
 %packages
-@russian-support
+langpacks-ru
 hunspell-ru
 # exclude input methods
--- a/Show More
+++ b/Show More