Add hardware and network support groups to ARM server (#1569183 )

These groups were added to the server environment group in comps but the change was not mirrored here, so the ARM server disk image is still missing wifi support etc. Signed-off-by: Adam Williamson <awilliam@redhat.com>
Merge #306 fedora-soas-common.ks: Include livecd-tools
2025-12-09 00:20:31 +08:00 · 2018-04-24 09:21:01 -07:00 · 2018-04-14 18:25:15 +00:00 · 2018-04-13 13:49:28 -04:00 · 2018-04-09 15:37:35 +00:00 · 2018-04-09 17:36:26 +02:00
70 changed files with 1018 additions and 749 deletions
--- a/README.md
+++ b/README.md
@@ -11,18 +11,18 @@ and modify the kickstart files for their local needs.

 ## To make a release ##

- * git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts
- * cd fedora-kickstarts
- * # If you need a specific branch other than master:
- * git checkout BRANCHNAME
- * # No tag has been added yet tag HEAD with
- * git tag VERSION
- * git push --tags
- * make
- * # Publish the released tar ball
- * make publish
- * # Clean up the generated files:
- * make clean
+    git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts
+    cd fedora-kickstarts
+    # If you need a specific branch other than master:
+    git checkout BRANCHNAME
+    # No tag has been added yet tag HEAD with
+    git tag VERSION
+    git push --tags
+    make
+    # Publish the released tar ball
+    make publish
+    # Clean up the generated files:
+    make clean

 # bug reports #

--- a/atomic-installer/lorax-configure-repo.tmpl
+++ b/atomic-installer/lorax-configure-repo.tmpl
@@ -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/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
@@ -4,13 +4,12 @@ auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns,ssh

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

 part /boot/fw --size=30 --fstype vfat --asprimary
 part /boot --size=512 --fstype ext4 --asprimary
 part swap --size=512 --fstype swap --asprimary
-part / --size=3584 --fstype ext4 --asprimary
+part / --size=2800 --fstype ext4 --asprimary

 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
@@ -23,34 +22,30 @@ services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setu
@core
@standard
@hardware-support
-@dial-up

 kernel
+# remove this in %post
 dracut-config-generic
+-dracut-config-rescue
 # install tools needed to manage and boot arm systems
@arm-tools
+-uboot-images-armv8
 rng-tools
 chrony
 extlinux-bootloader
 bcm283x-firmware
 initial-setup
 initial-setup-gui
+-iwl*
+-ipw*
+-usb_modeswitch
+-iproute-tc
 #lets resize / on first boot
 # dracut-modules-growroot

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

-# 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
--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -2,11 +2,8 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-common.ks

-part / --size=5690 --fstype ext4
+part / --size=6300 --fstype ext4

 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .

 %end
--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@@ -2,9 +2,8 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxde-common.ks

+part / --size=4000 --fstype ext4
+
 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .

 %end
--- a/fedora-arm-lxqt.ks
+++ b/fedora-arm-lxqt.ks
@@ -2,14 +2,13 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxqt-common.ks

+part / --size=4200 --fstype ext4 --asprimary
+
 %packages
 # trojita not available on non-x86 platforms
 -trojita
 %end

 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .

 %end
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -2,11 +2,8 @@
 %include fedora-arm-xbase.ks
 %include fedora-mate-common.ks

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

 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .

 %end
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -1,27 +1,10 @@
 %include fedora-arm-base.ks
+%include fedora-minimal-common.ks

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

 %packages
-@standard
-@dial-up
-initial-setup-gui
-generic-release*
-glibc-all-langpacks
-glibc-langpack-en
-iw
-NetworkManager-wifi
+-xkeyboard-config
 %end
-
-%post
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-%end
-
--- a/fedora-arm-server.ks
+++ b/fedora-arm-server.ks
@@ -1,14 +1,16 @@
 %include fedora-arm-base.ks

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

 %packages
-@dial-up
-# install the default groups for the server evironment since installing the environment is not working
+# install the default groups for the server environment since installing the environment is not working
@server-product
@standard
@headless-management
+@hardware-support
+@networkmanager-submodules
+
@container-management
@domain-client
 -initial-setup-gui
--- a/fedora-arm-soas.ks
+++ b/fedora-arm-soas.ks
@@ -2,9 +2,8 @@
 %include fedora-arm-xbase.ks
 %include fedora-soas-common.ks

+part / --size=3300 --fstype ext4 --asprimary
+
 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .

 %end
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-workstation-common.ks

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

 %packages
 -initial-setup
--- a/fedora-arm-xbase.ks
+++ b/fedora-arm-xbase.ks
@@ -10,4 +10,7 @@
 # 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
@@ -2,11 +2,8 @@
 %include fedora-arm-xbase.ks
 %include fedora-xfce-common.ks

-part / --size=4000 --fstype ext4
+part / --size=4700 --fstype ext4

 %post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .

 %end
--- a/fedora-atomic.ks
+++ b/fedora-atomic.ks
@@ -1,12 +1,22 @@
-# 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.
+# Fedora Atomic Host is the Fedora version of the "Atomic Host" pattern
+# from [Project Atomic](http://www.projectatomic.io/).

-# 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.
+# This kickstart is used for cloud/virt images, and uses cloud-init
+# to bootstrap authentication, just like Fedora Cloud Base.  (Also note the
+# fedora-atomic-vagrant.ks kickstart inherits from this).

-text
+# One very important thing to understand is that this image contains the same
+# OSTree commit as will be used on bare metal installations - Fedora Atomic Host
+# also has an ISO. One difference though is that cloud-init isn't enabled for
+# bare metal. When processing this kickstart then, Anaconda isn't actually
+# installing packages - it's just replicating a "pre-assembled" tree from
+# rpm-ostree.
+
+# Basically, the `ostreesetup` verb replaces the traditional `%packages`
+# section. For example, `rpm-ostree status` can show you the same checksum and
+# version from an ISO install and this cloud image - it's the same bits.
+
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
@@ -14,45 +24,64 @@ timezone --utc Etc/UTC
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
-user --name=none

+# Explicitly disable firewall since cloud providers generally provide
+# higher level firewall constructs (i.e. security groups).
 firewall --disabled

-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+# console=ttyAMA0 and console=hvc0 as kernel boot parameter to see
+# kernel boot messages on serial console as well on aarch64 and
+# ppc64le respectively.
+# https://pagure.io/atomic-wg/issue/347
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 console=ttyAMA0 console=hvc0 net.ifnames=0"

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

 zerombr
 clearpart --all
-# Atomic differs from cloud - we want LVM
-part /boot --size=300 --fstype="ext4"
+# Implement: https://pagure.io/atomic-wg/issue/281
+# The bare metal layout currently inherits from fedora server and is in
+# https://github.com/rhinstaller/anaconda/blob/master/pyanaconda/installclasses/fedora_atomic_host.py
+# However, the disk size is currently just 6GB for the cloud image (defined in pungi-fedora).  So the
+# "15GB, rest unallocated" model doesn't make sense.  The Vagrant box is 40GB (apparently a number of
+# Vagrant boxes come big and rely on thin provisioning).
+# In both cases, it's simplest to just fill all the disk space.
+#
+# Use reqpart to create hardware platform specific partitions
+# https://pagure.io/atomic-wg/issue/299
+reqpart --add-boot
 part pv.01 --grow
 volgroup atomicos pv.01
-logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
+# Start from 3GB as we did before, since we just need a size.  But we do --grow to fill all space.
+logvol / --size=3000 --grow --fstype="xfs" --name=root --vgname=atomicos

 # Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+# Pull from the ostree repo that was created during the compose
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/rawhide/${basearch}/atomic-host

 reboot

 %post --erroronfail
 # See https://github.com/projectatomic/rpm-ostree/issues/42
+# Set the ostree repo to the location we want users to upgrade from
+# This location is where the compose gets synced to after the compose
+# is done.
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'

 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
-# remove the user anaconda forces us to make
-userdel -r none

 # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
 cp /etc/skel/.bash* /var/roothome

 # Configure docker-storage-setup to resize the partition table on boot
-# https://github.com/projectatomic/docker-storage-setup/pull/25
-echo 'GROWPART=true' > /etc/sysconfig/docker-storage-setup
+# and extend the root filesystem to fill it.
+# https://pagure.io/atomic-wg/issue/343
+echo 'GROWPART=true' >> /etc/sysconfig/docker-storage-setup
+echo 'ROOT_SIZE=+100%FREE' >> /etc/sysconfig/docker-storage-setup

 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -68,12 +97,9 @@ 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
+# Remove any persistent NIC rules generated by udev
+rm -vf /etc/udev/rules.d/*persistent-net*.rules
+# And ensure that we will do DHCP on eth0 on startup
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
 DEVICE="eth0"
 BOOTPROTO="dhcp"
@@ -82,24 +108,12 @@ 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.
@@ -124,6 +138,9 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"

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

@@ -131,4 +148,10 @@ echo "Adding Developer Mode GRUB2 menu item."
 # 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-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@@ -12,23 +12,7 @@
@cinnamon-desktop
@libreoffice

-# internet and multimedia
-pidgin
-hexchat
-transmission
-parole
-
-# mp3 support
-gstreamer1-plugin-mpg123
-
-# make sure we have a graphical installer
-gnome-software              # for update-notification
-dnfdragora                  # for graphical (GTK and ncurses) package-management
-libyui-mga-gtk              # GTK3-frontend for dnfdragora (graphical use)
-libyui-mga-ncurses          # Ncurses-frontend for dnfdragora (text-mode use)
-
 # extra backgrounds
-desktop-backgrounds-basic
-f25-backgrounds-extras-gnome
+f28-backgrounds-extras-gnome

 %end
--- a/fedora-cloud-base-arm.ks
+++ b/fedora-cloud-base-arm.ks
@@ -1,12 +0,0 @@
-%include fedora-cloud-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyAMA0,115200n8"
-
-part /boot --fstype="ext4" --size=500
-part /boot/efi --fstype="vfat" --size=100
-
-%packages
-efibootmgr
-grub2-efi
-shim
-%end
--- a/fedora-cloud-base-ppc.ks
+++ b/fedora-cloud-base-ppc.ks
@@ -1,10 +0,0 @@
-%include fedora-cloud-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part prepboot --fstype="prepboot" --size=4
-part /boot --fstype="ext4" --size=500
-
-%packages
-grub2
-%end
--- 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" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"

 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between
@@ -32,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
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -1,10 +1,10 @@
-# This is a basic Fedora 21 spin designed to work in OpenStack and other
+# This is a basic Fedora cloud spin designed to work in OpenStack and other
 # private cloud environments. It's configured with cloud-init so it will
 # take advantage of ec2-compatible metadata services for provisioning ssh
 # keys. Cloud-init creates a user account named "fedora" with passwordless
 # sudo access. The root password is empty and locked by default.
 #
-# Note that unlike the standard F20 install, this image has /tmp on disk
+# Note that unlike the standard Fedora install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 #
 # This kickstart file is designed to be used with ImageFactory (in Koji).
@@ -13,12 +13,12 @@
 # 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
@@ -32,24 +32,18 @@ timezone --utc Etc/UTC
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
-user --name=none

 firewall --disabled

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

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

 zerombr
 clearpart --all
-#
-# We need to disable 64bit options here or extlinux won't work.
-# See: http://www.syslinux.org/wiki/index.php/Filesystem#ext4
-# and
-# https://bugzilla.redhat.com/show_bug.cgi?id=1369934
-#
-part / --fstype ext4 --grow --mkfsoptions="-O ^64bit"
+autopart --noboot --nohome --noswap --nolvm

 %include fedora-repo.ks

@@ -88,7 +82,9 @@ which
 #-kbd
 -uboot-tools
 -kernel
-grub2
+# No need for plymouth. Also means anaconda won't put rhgb/quiet
+# on kernel command line
+-plymouth

 %end

@@ -122,12 +118,6 @@ ln -sf /boot/grub/grub.conf /etc/grub.conf
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
-# remove the user anaconda forces us to make
-userdel -r none
-
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf

 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
@@ -181,11 +171,6 @@ 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"
@@ -242,21 +227,13 @@ echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*

-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
 # FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
-chattr -i /boot/extlinux/ldlinux.sys
-/usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
+# ignore return code because UEFI systems with vfat filesystems
+# that don't support selinux will give us errors
+/usr/sbin/fixfiles -R -a restore || true

 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
@@ -264,8 +241,12 @@ 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://fedorahosted.org/cloud/ticket/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
+# When we build the image with oz, dracut is used 
+# and sets up a ifcfg-en<whatever> for the device. We don't 
+# want to use this, we use eth0 so it is always the same. 
+# So we remove all these ifcfg-en<whatever> devices so 
+# The 'network' service can come up cleanly.
+rm -f /etc/sysconfig/network-scripts/ifcfg-en*

 # Enable network service here, as doing it in the services line
 # fails due to RHBZ #1369794
@@ -275,5 +256,11 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
 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

--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -23,7 +23,7 @@ user --name=none

 firewall --disabled

-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"

 network --bootproto=dhcp --device=eth0 --activate --onboot=on
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -97,10 +97,6 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
-
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
@@ -209,9 +205,7 @@ echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
 mkdir -p /var/cache/yum
-chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys

 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -14,7 +14,7 @@ user --name=none

 firewall --disabled

-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"

 network --bootproto=dhcp --device=eth0 --activate --onboot=on
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -88,10 +88,6 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
-
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -0,0 +1,90 @@
+# fedora-disk-base.ks
+#
+# Defines the basics for all kickstarts in the fedora-live branch
+# Does not include package selection (other then mandatory)
+# Does not include localization packages or configuration
+#
+# Does includes "default" language configuration (kickstarts including
+# this template can override these settings)
+
+text
+lang en_US.UTF-8
+keyboard us
+timezone US/Eastern
+auth --useshadow --passalgo=sha512
+selinux --enforcing
+firewall --enabled --service=mdns
+services --enabled=sshd,NetworkManager,chronyd
+network --bootproto=dhcp --device=link --activate
+rootpw --lock --iscrypted locked
+shutdown
+
+bootloader --timeout=1
+
+zerombr
+clearpart --all --initlabel --disklabel=msdos
+
+# make sure that initial-setup runs and lets us do all the configuration bits
+firstboot --reconfig
+
+%include fedora-repo.ks
+
+%packages
+@core
+@standard
+@hardware-support
+
+kernel
+# remove this in %post
+dracut-config-generic
+-dracut-config-rescue
+# install tools needed to manage and boot arm systems
+@arm-tools
+-uboot-images-armv7
+rng-tools
+chrony
+bcm283x-firmware
+initial-setup
+-iwl*
+-ipw*
+-trousers-lib
+-usb_modeswitch
+-iproute-tc
+-generic-release*
+
+# make sure all the locales are available for inital0-setup and anaconda to work
+glibc-all-langpacks
+
+%end
+
+%post
+
+# Setup Raspberry Pi firmware
+cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
+mv -f /boot/efi/config-64.txt /boot/efi/config.txt
+cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+echo "Packages within this disk image"
+rpm -qa
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
+# remove random seed, the newly installed instance should make it's own
+rm -f /var/lib/systemd/random-seed
+
+# The enp1s0 interface is a left over from the imagefactory install, clean this up
+rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0
+
+dnf -y remove dracut-config-generic
+
+# Disable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
+
+%end
--- a/fedora-disk-minimal.ks
+++ b/fedora-disk-minimal.ks
@@ -0,0 +1,10 @@
+%include fedora-disk-base.ks
+%include fedora-minimal-common.ks
+
+services --enabled=sshd,NetworkManager,chronyd,initial-setup
+
+autopart --type=plain
+
+%packages
+-xkeyboard-config
+%end
--- a/fedora-disk-server.ks
+++ b/fedora-disk-server.ks
@@ -0,0 +1,27 @@
+%include fedora-disk-base.ks
+
+services --enabled=sshd,NetworkManager,chronyd,initial-setup
+
+autopart
+
+%packages
+# install the default groups for the server evironment since installing the environment is not working
+@server-product
+@standard
+@headless-management
+@container-management
+@domain-client
+-initial-setup-gui
+-generic-release*
+%end
+
+%post
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+%end
+
--- a/fedora-disk-workstation.ks
+++ b/fedora-disk-workstation.ks
@@ -0,0 +1,19 @@
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-workstation-common.ks
+
+bootloader --append="cma=256MB"
+
+services --enabled=sshd,NetworkManager,chronyd
+
+autopart --type=plain
+
+%packages
+-initial-setup
+-initial-setup-gui
+
+%end
+
+%post
+
+%end
--- a/fedora-disk-xbase.ks
+++ b/fedora-disk-xbase.ks
@@ -0,0 +1,21 @@
+%packages
+@base-x
+@fonts
+@input-methods
+@multimedia
+@printing
+-@guest-desktop-agents
+
+# Need aajohan-comfortaa-fonts for the SVG rnotes images
+aajohan-comfortaa-fonts
+
+# anaconda needs the locales available to run for different locales
+glibc-all-langpacks
+
+%end
+
+%post
+# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
+ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
+
+%end
--- a/fedora-docker-base-arm.ks
+++ b/fedora-docker-base-arm.ks
@@ -1,6 +0,0 @@
-%include fedora-docker-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part /boot --fstype="ext4" --size=500
-part /boot/efi --fstype="vfat" --size=100
--- a/fedora-docker-base-minimal.ks
+++ b/fedora-docker-base-minimal.ks
@@ -1,64 +1,15 @@
-# This is a minimal Fedora install designed to serve as a Docker base image.
-#
-# To keep this image minimal it only installs English language. You need to change
-# 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:
-#
-#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
-#
+# See docker-base-common.ks for details on how to hack on docker image kickstarts
+# This base is a stripped back Fedora image without python3/dnf.
+# If you need that use the standard base image.

-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
-zerombr
-clearpart --all
-part / --fstype ext4 --grow
-network --bootproto=dhcp --device=link --activate --onboot=on
-reboot
+%include fedora-docker-common.ks

 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
-bash
-fedora-release
 microdnf
-kernel
-e2fsprogs
-libss # used by e2fsprogs
-fuse-libs
-

 %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)
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-echo "# fstab intentionally empty for containers" > /etc/fstab
-
-# Remove machine-id on pre generated images
-rm -fv /etc/machine-id
-touch /etc/machine-id
-
 # remove some random help txt files
 rm -fv usr/share/gnupg/help*.txt

@@ -88,7 +39,7 @@ mv /usr/share/zoneinfo/UTC /etc/localtime
 rm -rfv  /usr/share/zoneinfo

 # Final pruning
-rm -rfv var/cache/* var/log/* tmp/*
+rm -rfv /var/cache/* /var/log/* /tmp/*

 %end

--- a/fedora-docker-base-ppc.ks
+++ b/fedora-docker-base-ppc.ks
@@ -1,5 +0,0 @@
-%include fedora-docker-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part prepboot --fstype="prepboot" --size=4
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -1,67 +1,28 @@
-# This is a minimal Fedora install designed to serve as a Docker base image.
-#
-# To keep this image minimal it only installs English language. You need to change
-# 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:
-#
-#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
-#
+# See docker-base-common.ks for details on how to hack on docker image kickstarts
+# This base is a standard Fedora image with python3 and dnf

-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
-zerombr
-clearpart --all
-part / --fstype ext4 --grow
-network --bootproto=dhcp --device=link --activate --onboot=on
-reboot
+%include fedora-docker-common.ks

 %packages --excludedocs --instLangs=en --nocore
-bash
-tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
-fedora-release
 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
-#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
-kernel
-

 %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)
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-echo "# fstab intentionally empty for containers" > /etc/fstab
-
 # 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
+
 #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

@@ -69,11 +30,15 @@ systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connec
 # Fix /run/lock breakage since it's not tmpfs in docker
 # This unmounts /run (tmpfs) and then recreates the files
 # in the /run directory on the root filesystem of the container
+#
+# We ignore the return code of the systemd-tmpfiles command because
+# at this point we have already removed the /etc/machine-id and all
+# tmpfiles lines with %m in them will fail and cause a bad return
+# code. Example failure:
+#   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
+#
 umount /run
-systemd-tmpfiles --create --boot
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
+systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
+rm /run/nologin # https://pagure.io/atomic-wg/issue/316

 %end
--- a/fedora-docker-common.ks
+++ b/fedora-docker-common.ks
@@ -0,0 +1,74 @@
+# 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://pagure.io/fedora-atomic/raw/master/f/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
+coreutils-single
+glibc-minimal-langpack
+libcrypt
+rpm
+shadow-utils
+sssd-client
+util-linux
+-kernel
+-dosfstools
+-e2fsprogs
+-fuse-libs
+-gnupg2-smime
+-libss # used by e2fsprogs
+-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-kde-common.ks
+++ b/fedora-kde-common.ks
@@ -1,3 +1,4 @@
+
 %packages
@firefox
@kde-apps
@@ -10,7 +11,7 @@
 ### The KDE-Desktop

 ### Browser
-qupzilla
+falkon

 ### fixes

@@ -18,7 +19,7 @@ qupzilla
 -system-config-printer
 # make sure mariadb lands instead of MySQL (hopefully a temporary hack)
 mariadb-embedded
-mariadb-libs
+mariadb-connector-c
 mariadb-server

 # minimal localization support - allows installing the kde-l10n-* packages
@@ -42,32 +43,8 @@ k3b				# ~15 megs
 fuse
 mediawriter

-# only include kdegames-minimal
-kdegames
-kdegames-minimal
-
 ### space issues

-# fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts			# a compact CJK font, to replace:
-naver-nanum-gothic-fonts		# Korean
-vlgothic-fonts				# Japanese
-adobe-source-han-sans-cn-fonts		# simplified Chinese
-adobe-source-han-sans-tw-fonts 	# traditional Chinese
-
-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
-#-stix-fonts		# mathematical symbols
-
-# remove input methods to free space
-@input-methods
-scim*
-m17n*
-ibus*
-iok
-
-# save some space (from @standard)
-make
-
 # admin-tools
 -gnome-disk-utility
 # kcm_clock still lacks some features, so keep system-config-date around
--- a/fedora-kde-minimization.ks
+++ b/fedora-kde-minimization.ks
@@ -0,0 +1,8 @@
+# remove input methods to free space
+%packages
+-@input-methods
+-scim*
+-iok
+%end
+
+
--- a/fedora-live-astronomy_kde.ks
+++ b/fedora-live-astronomy_kde.ks
@@ -14,7 +14,8 @@
 # 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
@@ -24,7 +25,13 @@ part / --size 14500
 # Installing the default/mandatory packages from engineering & scientific
@engineering-and-scientific

+# Basic development
+@development-tools
+@c-development
+
 # astronomical data analysis
+astrometry
+astrometry-tycho2
 cdsclient
 fpack
 gcx
@@ -37,7 +44,7 @@ skyviewer
 swarp
 wcstools

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

 # misc. astronomy
 celestia
+stellarium
 virtualplanet

 # Some astro environment stuff
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -49,6 +49,7 @@ memtest86+

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

 # Need aajohan-comfortaa-fonts for the SVG rnotes images
@@ -56,7 +57,6 @@ 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
@@ -174,7 +174,7 @@ if [ -n "\$configdone" ]; then
  exit 0
 fi

-# add fedora user with no passwd
+# add liveuser 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
@@ -207,6 +207,10 @@ systemctl --no-reload disable atd.service 2> /dev/null || :
 systemctl stop crond.service 2> /dev/null || :
 systemctl stop atd.service 2> /dev/null || :

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

--- a/fedora-live-cinnamon.ks
+++ b/fedora-live-cinnamon.ks
@@ -32,6 +32,9 @@ sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/li
 # set Cinnamon as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf

+# no updater applet in live environment
+rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
+
 # Show harddisk install on the desktop
 sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -16,42 +16,24 @@ part / --size 14336
 # 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
+# Provides backup application
+deja-dup
+deja-dup-nautilus

 # Add extra gnome applications
 gnome-books
 gnome-calendar
 gnome-photos
+gnome-shell-extension-pomodoro
+gnome-todo
+
+# Add cosmetic for gnome-terminal
+powerline
+powerline-fonts

 # Extra wallpapers
-f25-backgrounds-extras-base
-f25-backgrounds-extras-gnome
-
+# f26-backgrounds-extras-base
+# f26-backgrounds-extras-gnome

 # removal of unneeded applications
 -gnome-boxes
@@ -64,7 +46,7 @@ f25-backgrounds-extras-gnome
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
 FOE

 # Add link to lists of tutorials
--- a/fedora-live-games.ks
+++ b/fedora-live-games.ks
@@ -189,7 +189,6 @@ games-menus

 # No compilations of games as I want to only include games that at least
 # someone thought were good within a genre.
-kdegames

 # Nothing should be downloading data to play.
 -autodownloader
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -77,7 +77,7 @@ sooperlooper

 #recodring and DAW
 audacity
-ardour4
+ardour5
 rosegarden4
 seq24
 muse
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -55,11 +55,9 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF

-# Disable plasma-pk-updates
-sed -i \
-    -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \
-    /usr/share/plasma/plasmoids/org.kde.plasma.pkupdates/metadata.desktop \
-    /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop
+# Disable plasma-pk-updates (bz #1436873 and 1206760)
+echo "Removing plasma-pk-updates package."
+rpm -e plasma-pk-updates

 # Disable baloo
 cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -9,9 +9,10 @@

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

 # DVD payload
-part / --size=6144
+part / --size=6500

 %post
 %end
--- a/fedora-live-lxqt.ks
+++ b/fedora-live-lxqt.ks
@@ -38,6 +38,9 @@ cat > /etc/xdg/libfm/pref-apps.conf << FOE
 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/
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -21,6 +21,9 @@ fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop

+# and mark it as executable
+chmod +x /home/liveuser/Desktop/liveinst.desktop
+
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas

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

+# no updater applet in live environment
+rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
+
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@@ -10,9 +10,6 @@
 -numactl
 -isdn4k-utils
 -autofs
-# smartcards won't really work on the livecd.
-coolkey
-wget

 # scanning takes quite a bit of space :/
 -xsane
--- a/fedora-live-robotics.ks
+++ b/fedora-live-robotics.ks
@@ -47,7 +47,6 @@ firefox

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

--- a/fedora-live-scientific_kde.ks
+++ b/fedora-live-scientific_kde.ks
@@ -8,169 +8,13 @@
 # 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

-%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
-python3-mpi4py-openmpi
-
-#Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
-git
-git-gui
-# Mercurial
-mercurial
-mercurial-hgk
-
-#Backup Utilities
-backintime-kde
-
-#needs to install this specifically because of some conflict between openmpi
-#and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
-libotf
-
-#root
-root
-root-gui-fitpanel
-root-python
-
-#Multiple jobs/clustering system
-# torque
-# torque-server
-# torque-scheduler
-# torque-gui
-# torque-libs
-# torque-mom
-# python-pbs
-
-#Drawing, Picture viewing tools, Visualization tools
-dia
-inkscape
-xzgv
-gimp
-ggobi
-ggobi-devel
-#g3data
-#Mayavi
-
-#Misc. Utils
-screen
-tmux
-rlwrap
-hexchat
-shutter
-fig2ps
-bibtex2html
-hevea
-
-#Include Mozilla Firefox
-firefox
-
-%end
-
 %post

 %end
--- a/fedora-live-security.ks
+++ b/fedora-live-security.ks
@@ -36,8 +36,7 @@ gnome-keyring-pam
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
-realmd                     # only seems to be used in GNOME
-PackageKit*                # we switched to yumex, so we don't need this
+-PackageKit*                # we switched to dnfdragora, so we don't need this
 -aspell-*                   # dictionaries are big
 -gnumeric
 -foomatic-db-ppds
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -4,7 +4,11 @@

 %include fedora-live-base.ks
 %include fedora-workstation-common.ks
-%include snippets/packagekit-cached-metadata.ks
+#
+# Disable this for now as packagekit is causing compose failures
+# by leaving a gpg-agent around holding /dev/null open.
+#
+#include snippets/packagekit-cached-metadata.ks

 part / --size 6656

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


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

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

+# suppress anaconda spokes redundant with gnome-initial-setup
+cat >> /etc/sysconfig/anaconda << FOE
+[NetworkSpoke]
+visited=1
+
+[PasswordSpoke]
+visited=1
+
+[UserSpoke]
+visited=1
+FOE
+
 # make the installer show up
 if [ -f /usr/share/applications/liveinst.desktop ]; then
  # Show harddisk install in shell dash
--- a/fedora-live-xfce.ks
+++ b/fedora-live-xfce.ks
@@ -60,6 +60,9 @@ sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.d
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop

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

--- a/fedora-lxde-common.ks
+++ b/fedora-lxde-common.ks
@@ -43,7 +43,7 @@ metacity
 -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
@@ -9,38 +9,13 @@

 %packages
@lxqt
+@lxqt-apps
+@lxqt-media
@networkmanager-submodules
+
 # for nm applet
 gnome-keyring

-# We have obconf-qt now
-obconf-qt
-obconf
-
-# No sddm-breeze, this pulls in huge parts of plasma, but use breeze for LXQt
-breeze-gtk
-plasma-breeze
-sddm-breeze
-
-# no kwallet running by default
-qupzilla-kwallet
-
-# Pull in some useful applications, use KDE ones if necessary
-dnfdragora
-dragon
-kcalc
-kwrite
-lxappearance
-lximage-qt
-lxqt-sudo
-pavucontrol-qt
-psi-plus
-qlipper
-quassel
-qpdfview-qt5
-transmission-qt
-trojita
-yarock

 # l10n
 lxqt-l10n
@@ -51,9 +26,6 @@ pavucontrol-qt-l10n
 # MP3
 gstreamer1-plugin-mpg123

-# We want Qt GUI for libyui used by dnfdragora
-libyui-mga-qt
-
 # 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:
@@ -72,5 +44,9 @@ wqy-microhei-fonts          # a compact CJK font, to replace:
 -ibus*
 -iok

+# Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132
+# Why is this not pulled in by anaconda???
+storaged
+
 %end

--- a/fedora-mate-common.ks
+++ b/fedora-mate-common.ks
@@ -1,7 +1,4 @@
 %packages
-PackageKit*                # we switched to yumex, so we don't need this
-PackageKit-command-not-found  # nifty for installing not-found cli-commands
-firefox
@mate
 compiz
 compiz-plugins-main
@@ -17,27 +14,11 @@ emerald-themes
 emerald
 fusion-icon
@networkmanager-submodules
-blueberry

 # some apps from mate-applications
 caja-actions
 mate-disk-usage-analyzer

-# more backgrounds
-f25-backgrounds-base
-f25-backgrounds-mate
-f25-backgrounds-extras-base
-
-# system tools
-system-config-printer
-system-config-printer-applet
-lightdm-gtk-greeter-settings
-
-# audio video
-parole
-exaile
-gstreamer1-plugin-mpg123  # mp3 support
-
 # blacklist applications which breaks mate-desktop
 -audacious

@@ -47,10 +28,6 @@ gstreamer1-plugin-mpg123  # mp3 support
 # 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
@@ -60,13 +37,9 @@ nss-mdns
 -brasero
 -colord
 -fedora-icon-theme
-GConf2
-gnome-bluetooth-libs
 -gnome-icon-theme
 -gnome-icon-theme-symbolic
 -gnome-software
-gnome-themes
-gnome-themes-standard
 -gnome-user-docs

 -@mate-applications
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@@ -0,0 +1,19 @@
+%packages
+-@standard
+-initial-setup-gui
+-generic-release*
+-glibc-all-langpacks
+glibc-langpack-en
+iw
+NetworkManager-wifi
+%end
+
+%post
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+%end
--- a/fedora-modular-arm-server.ks
+++ b/fedora-modular-arm-server.ks
@@ -0,0 +1,27 @@
+%include fedora-arm-base.ks
+
+# server defaults to xfs for / so lets do so on arm also
+part / --size=2500 --fstype xfs
+
+%packages
+# install the default groups for the server evironment since installing the environment is not working
+@server-product
+@standard
+@headless-management
+@container-management
+@domain-client
+-initial-setup-gui
+-generic-release*
+fedora-modular-release
+%end
+
+%post
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+%end
+
--- a/fedora-modular-container-base-minimal.ks
+++ b/fedora-modular-container-base-minimal.ks
@@ -0,0 +1,70 @@
+# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
+# This base is a stripped back Fedora image without python3/dnf.
+# If you need that use the standard base image.
+
+%include fedora-modular-container-common.ks
+
+%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+microdnf
+
+%end
+
+%post --erroronfail --log=/root/anaconda-post.log
+# remove some random help txt files
+rm -fv usr/share/gnupg/help*.txt
+
+# Pruning random things
+rm usr/lib/rpm/rpm.daily
+rm -rfv usr/lib64/nss/unsupported-tools/  # unsupported
+
+# Statically linked crap
+rm -fv usr/sbin/{glibc_post_upgrade.x86_64,sln}
+ln usr/bin/ln usr/sbin/sln
+
+# Remove some dnf info
+rm -rfv /var/lib/dnf
+
+# don't need icons
+rm -rfv /usr/share/icons/*
+
+#some random not-that-useful binaries
+rm -fv /usr/bin/pinky
+
+# we lose presets by removing /usr/lib/systemd but we do not care
+rm -rfv /usr/lib/systemd
+
+# if you want to change the timezone, bind-mount it from the host or reinstall tzdata
+rm -fv /etc/localtime
+mv /usr/share/zoneinfo/UTC /etc/localtime
+rm -rfv  /usr/share/zoneinfo
+
+# Final pruning
+rm -rfv /var/cache/* /var/log/* /tmp/*
+
+%end
+
+%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
+set -eux
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
+# Fix /run/lock breakage since it's not tmpfs in container
+# This unmounts /run (tmpfs) and then recreates the files
+# in the /run directory on the root filesystem of the container
+# NOTE: run this in nochroot because "umount" does not exist in chroot
+umount /mnt/sysimage/run
+# The file that specifies the /run/lock tmpfile is
+# /usr/lib/tmpfiles.d/legacy.conf, which is part of the systemd
+# rpm that isn't included in this image. We'll create the /run/lock
+# file here manually with the settings from legacy.conf
+# NOTE: chroot to run "install" because it is not in anaconda env
+chroot /mnt/sysimage install -d /run/lock -m 0755 -o root -g root
+
+
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
+# NOTE: run this in nochroot because "find" does not exist in chroot
+KEEPLANG=en_US
+for dir in locale i18n; do
+    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
+done
+
+%end
--- a/fedora-modular-container-base.ks
+++ b/fedora-modular-container-base.ks
@@ -0,0 +1,38 @@
+# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
+# This base is a standard Fedora image with python3 and dnf
+
+%include fedora-modular-container-common.ks
+
+%packages --excludedocs --instLangs=en --nocore
+rootfiles
+tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
+vim-minimal
+dnf
+dnf-yum  # https://pagure.io/fesco/ticket/1312#comment:29
+sssd-client
+
+%end
+
+%post --erroronfail --log=/root/anaconda-post.log
+# remove some extraneous files
+rm -rf /var/cache/dnf/*
+rm -rf /tmp/*
+
+#Mask mount units and getty service so that we don't get login prompt
+systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
+# Fix /run/lock breakage since it's not tmpfs in container
+# This unmounts /run (tmpfs) and then recreates the files
+# in the /run directory on the root filesystem of the container
+#
+# We ignore the return code of the systemd-tmpfiles command because
+# at this point we have already removed the /etc/machine-id and all
+# tmpfiles lines with %m in them will fail and cause a bad return
+# code. Example failure:
+#   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
+#
+umount /run
+systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
+
+%end
--- a/fedora-modular-container-common.ks
+++ b/fedora-modular-container-common.ks
@@ -0,0 +1,75 @@
+# This is the common bits between Container base images based on Modular Fedora.
+#
+# To keep this image minimal it only installs English language. You need to change
+# dnf configuration in order to enable other languages.
+#
+# ##  Hacking on this image ###
+# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
+# but you can run imagefactory locally too.
+#
+# To do so, testing local changes, first you'll need a TDL file.  I store one here:
+# https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
+#
+# Then, once you have imagefactory and imagefactory-plugins installed, run:
+#
+#   ksflatten -c fedora-modular-base[-minimal].ks -o fedora-modular-base-test.ks
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-modular-base-test.ks modular
+#
+
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+bootloader --disabled
+timezone --isUtc --nontp Etc/UTC
+rootpw --lock --iscrypted locked
+keyboard us
+network --bootproto=dhcp --device=link --activate --onboot=on
+reboot
+
+# boot partitions are irrelevant as the final container image is a tarball
+zerombr
+clearpart --all
+autopart --nohome --noswap --nolvm
+
+%packages --excludedocs --instLangs=en --nocore
+fedora-modular-release
+bash
+coreutils-single
+glibc-minimal-langpack
+libcrypt
+rpm
+shadow-utils
+sssd-client
+util-linux
+-kernel
+-dosfstools
+-e2fsprogs
+-fuse-libs
+-gnupg2-smime
+-libss # used by e2fsprogs
+-libusbx
+-pinentry
+-shared-mime-info
+-trousers
+-xkeyboard-config
+
+%end
+
+%post --erroronfail --log=/root/anaconda-post.log
+set -eux
+
+# Set install langs macro so that new rpms that get installed will
+# only install langs that we limit it to.
+LANG="en_US"
+echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
+echo "Import RPM GPG key"
+releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+
+echo "# fstab intentionally empty for containers" > /etc/fstab
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
+
+%end
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@@ -0,0 +1,81 @@
+text
+lang en_US.UTF-8
+keyboard us
+timezone US/Eastern
+auth --useshadow --passalgo=sha512
+selinux --enforcing
+# Disabled for modular compose (for now)
+#firewall --enabled --service=mdns
+# Disabled for modular compose (for now)
+#services --enabled=sshd,NetworkManager,chronyd,initial-setup
+network --bootproto=dhcp --device=link --activate
+rootpw --lock --iscrypted locked
+shutdown
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+zerombr
+clearpart --all --initlabel --disklabel=msdos
+autopart --type=plain
+
+# make sure that initial-setup runs and lets us do all the configuration bits
+firstboot --reconfig
+
+%include fedora-repo.ks
+
+%packages --excludedocs --excludeWeakdeps --nocore
+bash
+fedora-modular-release
+filesystem
+coreutils-single
+util-linux
+rpm
+shadow-utils
+microdnf
+glibc-minimal-langpack
+grubby
+kernel
+libcrypt
+sssd-client
+dhcp-client
+-fedora-logos
+-coreutils
+-dosfstools
+-e2fsprogs
+-fuse-libs
+-gnupg2-smime
+-libss # used by e2fsprogs
+-libusbx
+-pinentry
+-shared-mime-info
+-trousers
+-xkeyboard-config
+-dracut
+%end
+
+%post
+
+# Setup Raspberry Pi firmware
+#cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
+mv -f /boot/efi/config-64.txt /boot/efi/config.txt
+cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+
+releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+echo "Packages within this disk image"
+rpm -qa
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
+# remove random seed, the newly installed instance should make it's own
+rm -f /var/lib/systemd/random-seed
+
+# Disable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
+
+%end
--- a/fedora-python-classroom-common.ks
+++ b/fedora-python-classroom-common.ks
@@ -6,6 +6,11 @@

 %packages
@python-classroom
+@python-science
+nano
+openssh-clients
+vim-enhanced
+wget

 # Remove Pythons possibly recommended by tox
 -python26
--- a/fedora-python-classroom-gnome-common.ks
+++ b/fedora-python-classroom-gnome-common.ks
@@ -7,13 +7,17 @@
 %include fedora-python-classroom-common.ks

 %packages
+ninja-ide
+emacs
+python3-matplotlib-tk
+python3-pillow-tk
+
 # Remove extra gnome-y things
 -@graphical-internet
 -@games
 -@sound-and-video
 -@multimedia
 -dleyna*
-evolution*
 -gnome-boxes
 -gnome-calendar
 -gnome-clocks
@@ -22,6 +26,7 @@
 -gnome-documents
 -gnome-font-viewer
 -gnome-maps
+-gnome-photos
 -gnome-weather
 -grilo-plugins
 -cheese
@@ -30,7 +35,6 @@

 # This is no longer workstation
 -@workstation-product
-fedora-productimg-workstation

 # Add a web browser
@firefox
@@ -51,11 +55,11 @@

 # Dictionaries are big
 -aspell-*
-hunspell-*
 -words

 # Help and art can be big, too
 -gnome-user-docs
+-gnome-getting-started-docs
 -desktop-backgrounds-basic
 -*backgrounds-extras

--- a/fedora-repo-not-rawhide.ks
+++ b/fedora-repo-not-rawhide.ks
@@ -1,4 +1,4 @@
-repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
--- a/fedora-repo-rawhide.ks
+++ b/fedora-repo-rawhide.ks
@@ -1,2 +1,2 @@
-repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
--- a/fedora-scientific-common.ks
+++ b/fedora-scientific-common.ks
@@ -0,0 +1,157 @@
+%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
+python3-mpi4py-openmpi
+
+#Version control- a GUI for each as well
+
+# Installing rapidsvn will also install subversion package
+rapidsvn 
+git
+git-gui
+# Mercurial
+mercurial
+mercurial-hgk
+
+#Backup Utilities
+backintime-kde
+
+#needs to install this specifically because of some conflict between openmpi
+#and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
+libotf
+
+#root
+root
+root-gui-fitpanel
+root-python
+
+#Multiple jobs/clustering system
+# torque
+# torque-server
+# torque-scheduler
+# torque-gui
+# torque-libs
+# torque-mom
+# python-pbs
+
+#Drawing, Picture viewing tools, Visualization tools
+dia
+inkscape
+xzgv
+gimp
+ggobi
+ggobi-devel
+#g3data
+#Mayavi
+
+#Misc. Utils
+screen
+tmux
+rlwrap
+hexchat
+shutter
+fig2ps
+bibtex2html
+hevea
+
+#Include Mozilla Firefox
+firefox
+
+%end
--- 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-soas-common.ks
+++ b/fedora-soas-common.ks
@@ -30,8 +30,7 @@ firewall --enabled --service=mdns,presence
 -abrt-cli
 -ibus*
 -hyperv-daemons
-webkitgtk4-plugin-process-gtk2
-webkitgtk3
+-webkit2gtk3-plugin-process-gtk2

 # Add some extra fonts
 dejavu-sans-fonts
@@ -77,6 +76,10 @@ pulseaudio-utils
 # http://bugs.sugarlabs.org/ticket/1951
 rp-pppoe

+# Useful for SoaS duplication from:
+# http://bugs.sugarlabs.org/ticket/74
+livecd-tools
+
 # Get the Sugar boot screen
 -plymouth-system-theme
 -plymouth-theme-charge
--- a/fedora-workstation-common.ks
+++ b/fedora-workstation-common.ks
@@ -20,9 +20,6 @@
@printing
@workstation-product

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

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

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