add tar to address BZ#1409920

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
1343136 - the default OOMScoreAdjust=-900 does not cause any ill effects on fedora.
2025-12-09 00:20:31 +08:00 · 2017-01-04 15:36:56 -06:00 · 2016-09-20 18:20:28 +02:00 · 2016-08-13 13:25:32 -05:00 · 2016-08-04 07:43:46 -05:00 · 2016-07-27 10:36:46 -07:00
86 changed files with 977 additions and 1875 deletions
--- a/23
+++ b/23
@@ -0,0 +1,23 @@
+The master branch is where development takes place:
+ - it may contain kickstart files that are broken, or
+ - spin concepts that are in the process of being
+   approved by the Board (trademark approval), or
+ - spin concepts that are in the process of being
+   approved by the Spins SIG
+
+The release specific branches contain spin concepts that:
+ - are approved (both by Board and Spin SIG)
+ - maintained for the remainder of the release cycle
+
+git clone ssh://git.fedorahosted.org/git/spin-kickstarts.git spin-kickstarts
+cd spin-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
--- a/README.md
+++ b/README.md
@@ -1,31 +0,0 @@
-# fedora-kickstarts #
-
-This project is used to manage the Fedora kickstart files used in composing Fedora release images. 
-
-The master branch is used by rawhide and each release branch is used by that release. 
-
-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. 
-
-## 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
-
-# bug reports #
-
-Bugs should be reported to the spin-kickstarts bugzilla component:
-
-https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=spin-kickstarts
--- a/atomic-installer/lorax-configure-repo.tmpl
+++ b/atomic-installer/lorax-configure-repo.tmpl
@@ -0,0 +1,8 @@
+## Lorax template to configure Anaconda to use the local OSTree
+## repository on disk.
+
+<%page args="ostree_osname, ostree_ref"/>
+append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
+append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/24/'\n%end\n"
+
--- a/atomic-installer/lorax-embed-repo.tmpl
+++ b/atomic-installer/lorax-embed-repo.tmpl
@@ -0,0 +1,11 @@
+## Lorax template to embed an OSTree repository into the installer.iso
+## and configure an interactive installer use to look for it.
+##
+## Note that we pull with depth=0 to only get *one* commit into the
+## ISO, because we obviously don't want the full history.
+
+<%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>
+runcmd mkdir -p ${workdir}/iso-graft/content/repo
+runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2
+runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}
+runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}
--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@@ -0,0 +1,99 @@
+# Kickstart file to build the appliance operating
+# system for fedora.
+# This is based on the work at http://www.thincrust.net
+lang C
+keyboard us
+timezone US/Eastern
+auth --useshadow --passalgo=sha512
+selinux --permissive
+firewall --disabled
+bootloader --timeout=1 --append="acpi=force"
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network
+
+# Uncomment the next line
+# to make the root password be thincrust
+# By default the root password is emptied
+#rootpw --iscrypted $1$uw6MV$m6VtUWPed4SqgoW6fKfTZ/
+
+#
+# Partition Information. Change this as necessary
+# This information is used by appliance-tools but
+# not by the livecd tools.
+#
+part / --size 1024 --fstype ext4 --ondisk sda
+
+#
+# Repositories
+#
+%include fedora-repo.ks
+
+#
+# Add all the packages after the base packages
+#
+%packages --excludedocs --nobase
+bash
+kernel
+grub
+e2fsprogs
+passwd
+policycoreutils
+chkconfig
+rootfiles
+yum
+vim-minimal
+acpid
+#needed to disable selinux
+lokkit
+
+#Allow for dhcp access
+dhclient
+iputils
+
+#
+# Packages to Remove
+#
+
+# no need for kudzu if the hardware doesn't change
+-kudzu
+-prelink
+-setserial
+-ed
+
+# Remove the authconfig pieces
+-authconfig
+-rhpl
+-wireless-tools
+
+# Remove the kbd bits
+-kbd
+-usermode
+
+# these are all kind of overkill but get pulled in by mkinitrd ordering
+-mkinitrd
+-kpartx
+-dmraid
+-mdadm
+-lvm2
+-tar
+
+# selinux toolchain of policycoreutils, libsemanage, ustr
+-policycoreutils
+-checkpolicy
+-selinux-policy*
+-libselinux-python
+-libselinux
+
+# Things it would be nice to loose
+-fedora-logos
+generic-logos
+-fedora-release-notes
+%end
+
+#
+# Add custom post scripts after the base post.
+#
+%post
+
+%end
+
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -4,17 +4,17 @@ auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns,ssh

-bootloader --location=mbr
+# 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
+part /boot --size=512 --fstype ext4
+part swap --size=512 --fstype swap
+part / --size=3584 --fstype ext4

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

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

 %include fedora-repo.ks

@@ -22,40 +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
-
 %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)
@@ -76,13 +66,5 @@ 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 +1,12 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-kde-common.ks
+%include fedora-kde-packages.ks

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

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

 %end
--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@@ -1,9 +1,10 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-lxde-common.ks
-
-part / --size=4000 --fstype ext4
+%include fedora-lxde-packages.ks

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

 %end
--- a/fedora-arm-lxqt.ks
+++ b/fedora-arm-lxqt.ks
@@ -1,14 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-lxqt-common.ks
-
-part / --size=4200 --fstype ext4 --asprimary
-
-%packages
-# trojita not available on non-x86 platforms
-trojita
-%end
-
-%post
-
-%end
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -1,9 +1,12 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-mate-common.ks
+%include fedora-mate-packages.ks

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

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

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

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

 %packages
-xkeyboard-config
+-@standard
+-@dial-up
+-initial-setup-gui
+-generic-release*
+-glibc-all-langpacks
+glibc-langpack-en
+iw
+NetworkManager-wifi
 %end
+
+%post
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+%end
+
--- a/fedora-arm-python-classroom.ks
+++ b/fedora-arm-python-classroom.ks
@@ -1,8 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# The ARM Workstion based Python Classroom Lab
-
-%include fedora-arm-workstation.ks
-%include fedora-python-classroom-gnome-common.ks
--- a/fedora-arm-server.ks
+++ b/fedora-arm-server.ks
@@ -1,16 +1,14 @@
 %include fedora-arm-base.ks

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

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

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

 %end
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@@ -1,8 +1,8 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-workstation-common.ks
+%include fedora-workstation-packages.ks

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

 %packages
 -initial-setup
@@ -10,8 +10,3 @@ part / --size=6200 --fstype ext4

 %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
@@ -6,11 +6,3 @@
@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 +1,12 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-xfce-common.ks
+%include fedora-xfce-packages.ks

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

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

 %end
--- a/fedora-atomic-vagrant.ks
+++ b/fedora-atomic-vagrant.ks
@@ -1,8 +1,10 @@
-# Like the Atomic Host cloud image, but tuned for vagrant: enable the
-# vagrant user, disable cloud-init.
+# Like the Atomic cloud image, but tuned for vagrant.  Enable
+# the vagrant user, disable cloud-init.

 %include fedora-atomic.ks

+services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
+
 user --name=vagrant --password=vagrant
 rootpw vagrant

@@ -12,19 +14,16 @@ rootpw 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
+echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
 sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
 mkdir -m 0700 -p ~vagrant/.ssh
 cat > ~vagrant/.ssh/authorized_keys << EOKEYS
--- a/fedora-atomic.ks
+++ b/fedora-atomic.ks
@@ -1,22 +1,12 @@
-# Fedora Atomic Host is the Fedora version of the "Atomic Host" pattern
-# from [Project Atomic](http://www.projectatomic.io/).
+# 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 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).
+# 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.

-# 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
+text
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
@@ -24,64 +14,43 @@ 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

-# 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"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"

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

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

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

 reboot

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

 # 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 the user anaconda forces us to make
+userdel -r none

 # Configure docker-storage-setup to resize the partition table on boot
-# and extend the root filesystem to fill it.
-# https://pagure.io/atomic-wg/issue/343
-echo 'GROWPART=true' >> /etc/sysconfig/docker-storage-setup
-echo 'ROOT_SIZE=+100%FREE' >> /etc/sysconfig/docker-storage-setup
+# 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
@@ -97,9 +66,12 @@ NETWORKING=yes
 NOZEROCONF=yes
 EOF

-# Remove any persistent NIC rules generated by udev
-rm -vf /etc/udev/rules.d/*persistent-net*.rules
-# And ensure that we will do DHCP on eth0 on startup
+# 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"
@@ -108,12 +80,24 @@ 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.
@@ -123,7 +107,7 @@ systemctl mask tmp.mount
 #EOF

 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
+rm -f /var/lib/random-seed

 echo "Packages within this cloud image:"
 echo "-----------------------------------------------------------------------"
@@ -138,20 +122,8 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"

-# 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-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@@ -1,18 +0,0 @@
-# fedora-cinnamon-common.ks
-#
-# Description:
-# - Fedora package set for the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%packages
-
-@networkmanager-submodules
-@cinnamon-desktop
-@libreoffice
-
-# extra backgrounds
-f28-backgrounds-extras-gnome
-
-%end
--- a/fedora-cinnamon-packages.ks
+++ b/fedora-cinnamon-packages.ks
@@ -0,0 +1,32 @@
+# fedora-cinnamon-packages.ks
+#
+# Description:
+# - Fedora package set for the Cinnamon Desktop Environment
+#
+# Maintainer(s):
+# - Dan Book <grinnz@grinnz.com>
+
+%packages
+
+@networkmanager-submodules
+@cinnamon-desktop
+@libreoffice
+
+# internet and multimedia
+pidgin
+hexchat
+transmission
+parole
+
+# make sure we have a graphical installer
+yumex-dnf
+
+# extra backgrounds
+desktop-backgrounds-basic
+f24-backgrounds-extras-gnome
+
+# save some space
+-fedora-icon-theme
+-PackageKit*                # we switched to yumex, so we don't need this
+
+%end
--- a/fedora-cloud-atomic-pxetolive.ks
+++ b/fedora-cloud-atomic-pxetolive.ks
@@ -14,7 +14,7 @@ network --bootproto=dhcp --device=link --activate
 part / --fstype="ext4" --size=6000
 part /boot --size=500 --fstype="ext4"
 shutdown
-services --disabled=docker-storage-setup
+services --disabled=docker-storage-setup,network
 services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
@@ -28,9 +28,4 @@ userdel -r none
 # We copy content of separate /boot partition to root part when building live squashfs image,
 # and we don't want systemd to try to mount it when pxe booting
 cat /dev/null > /etc/fstab
-
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
 %end
--- a/fedora-cloud-base-arm.ks
+++ b/fedora-cloud-base-arm.ks
@@ -0,0 +1,12 @@
+%include fedora-cloud-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyAMA0,115200n8"
+
+part /boot --fstype="ext4" --size=500
+part /boot/efi --fstype="vfat" --size=100
+
+%packages
+efibootmgr
+grub2-efi
+shim
+%end
--- a/fedora-cloud-base-ppc.ks
+++ b/fedora-cloud-base-ppc.ks
@@ -0,0 +1,10 @@
+%include fedora-cloud-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+part prepboot --fstype="prepboot" --size=4
+part /boot --fstype="ext4" --size=500
+
+%packages
+grub2
+%end
--- a/fedora-cloud-base-vagrant.ks
+++ b/fedora-cloud-base-vagrant.ks
@@ -19,7 +19,7 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux

 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between
@@ -32,8 +32,6 @@ dnf-yum
 # users setup. This can actually take a bit of time.  Just fold it
 # in to the base box disk image
 rsync
-# Add in sshfs for vagrant-sshfs plugin
-fuse-sshfs
 %end

 %post --erroronfail
@@ -44,7 +42,7 @@ systemctl mask cloud-init cloud-init-local cloud-config cloud-final

 # Vagrant setup
 sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
 sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
 mkdir -m 0700 -p ~vagrant/.ssh
 cat > ~vagrant/.ssh/authorized_keys << EOKEYS
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -1,10 +1,10 @@
-# This is a basic Fedora cloud spin designed to work in OpenStack and other
+# This is a basic Fedora 21 spin designed to work in OpenStack and other
 # private cloud environments. It's configured with cloud-init so it will
 # take advantage of ec2-compatible metadata services for provisioning ssh
 # keys. Cloud-init creates a user account named "fedora" with passwordless
 # sudo access. The root password is empty and locked by default.
 #
-# Note that unlike the standard Fedora install, this image has /tmp on disk
+# Note that unlike the standard F20 install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 #
 # This kickstart file is designed to be used with ImageFactory (in Koji).
@@ -13,18 +13,18 @@
 # http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
 #
 # For a TDL file, I store one here:
-# https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
+# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
 # (Koji generates one internally...what we really want is Koji to publish it statically)
 # 
 # Once you have imagefactory and imagefactory-plugins installed, run:
 # 
-#   curl -O https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
+#   curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl 
 #   tempfile=$(mktemp --suffix=.ks)
 #   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
 #   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
 #

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

 firewall --disabled

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

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

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

 %include fedora-repo.ks

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

 %end

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

 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
@@ -153,6 +157,9 @@ localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archiv
 mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
 build-locale-archive
 echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
+awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
+    < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf


 echo -n "Getty fixes"
@@ -171,6 +178,11 @@ NOZEROCONF=yes
 DEVTIMEOUT=10
 EOF

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

 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
+rm -f /var/lib/random-seed

 echo "Cleaning old dnf repodata."
 # FIXME: clear history?
@@ -227,13 +239,22 @@ echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*

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

 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
@@ -241,26 +262,8 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"

-# When we build the image with oz, dracut is used 
-# and sets up a ifcfg-en<whatever> for the device. We don't 
-# want to use this, we use eth0 so it is always the same. 
-# So we remove all these ifcfg-en<whatever> devices so 
-# The 'network' service can come up cleanly.
-rm -f /etc/sysconfig/network-scripts/ifcfg-en*
-
-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-# Anaconda is writing an /etc/resolv.conf from the install environment.
-# The system should start out with an empty file, otherwise cloud-init
-# will try to use this information and may error:
-# https://bugs.launchpad.net/cloud-init/+bug/1670052
-truncate -s 0 /etc/resolv.conf
+# For trac ticket https://fedorahosted.org/cloud/ticket/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3

 %end

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

 firewall --disabled

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

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

 zerombr
 clearpart --all
@@ -97,6 +97,10 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

+# Kickstart specifies timeout in seconds; syslinux uses 10ths.
+# 0 means wait forever, so instead we'll go with 1.
+sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
@@ -174,7 +178,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 #EOF

 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
+rm -f /var/lib/random-seed

 echo "Cleaning old yum repodata."
 yum history new
@@ -205,7 +209,9 @@ 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
@@ -213,9 +219,5 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"

-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
 %end

--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -14,10 +14,10 @@ user --name=none

 firewall --disabled

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

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

 zerombr
 clearpart --all
@@ -88,6 +88,10 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

+# Kickstart specifies timeout in seconds; syslinux uses 10ths.
+# 0 means wait forever, so instead we'll go with 1.
+sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
@@ -165,7 +169,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 #EOF

 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
+rm -f /var/lib/random-seed

 echo "Cleaning old yum repodata."
 yum history new
@@ -207,9 +211,5 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"

-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
 %end

--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -1,90 +0,0 @@
-# fedora-disk-base.ks
-#
-# Defines the basics for all kickstarts in the fedora-live branch
-# Does not include package selection (other then mandatory)
-# Does not include localization packages or configuration
-#
-# Does includes "default" language configuration (kickstarts including
-# this template can override these settings)
-
-text
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-firewall --enabled --service=mdns
-services --enabled=sshd,NetworkManager,chronyd
-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
@@ -1,10 +0,0 @@
-%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
@@ -1,27 +0,0 @@
-%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
@@ -1,19 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-disk-xbase.ks
-%include fedora-workstation-common.ks
-
-bootloader --append="cma=256MB"
-
-services --enabled=sshd,NetworkManager,chronyd
-
-autopart --type=plain
-
-%packages
-initial-setup
-initial-setup-gui
-
-%end
-
-%post
-
-%end
--- a/fedora-disk-xbase.ks
+++ b/fedora-disk-xbase.ks
@@ -1,21 +0,0 @@
-%packages
-@base-x
-@fonts
-@input-methods
-@multimedia
-@printing
-@guest-desktop-agents
-
-# Need aajohan-comfortaa-fonts for the SVG rnotes images
-aajohan-comfortaa-fonts
-
-# anaconda needs the locales available to run for different locales
-glibc-all-langpacks
-
-%end
-
-%post
-# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
-ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
-
-%end
--- a/fedora-docker-base-arm.ks
+++ b/fedora-docker-base-arm.ks
@@ -0,0 +1,6 @@
+%include fedora-docker-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+part /boot --fstype="ext4" --size=500
+part /boot/efi --fstype="vfat" --size=100
--- a/fedora-docker-base-minimal.ks
+++ b/fedora-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-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-docker-base-ppc.ks
+++ b/fedora-docker-base-ppc.ks
@@ -0,0 +1,5 @@
+%include fedora-docker-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+part prepboot --fstype="prepboot" --size=4
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -1,44 +1,89 @@
-# 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
+# This is a minimal Fedora install designed to serve as a Docker base image.
+#
+# To keep this image minimal it only installs English language. You need to change
+# yum configuration in order to enable other languages.
+#
+###  Hacking on this image ###
+# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
+# but you can run imagefactory locally too.
+#
+# To do so, testing local changes, first you'll need a TDL file.  I store one here:
+# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
+#
+# Then, once you have imagefactory and imagefactory-plugins installed, run:
+#
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
+#

-%include fedora-docker-common.ks
+cmdline
+bootloader --disabled
+timezone --isUtc --nontp Etc/UTC
+rootpw --lock --iscrypted locked
+user --name=none
+
+keyboard us
+zerombr
+clearpart --all
+part / --fstype ext4 --grow
+network --bootproto=dhcp --device=link --activate --onboot=on
+reboot

 %packages --excludedocs --instLangs=en --nocore
-rootfiles
-# https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
-fedora-repos-modular
+bash
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
+fedora-release
+rootfiles
 vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sssd-client
+#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
+-kernel
+

 %end

-%post --erroronfail --log=/root/anaconda-post.log
-# remove some extraneous files
-rm -rf /var/cache/dnf/*
-rm -rf /tmp/*
+%post --log=/tmp/anaconda-post.log
+# Set the language rpm nodocs transaction flag persistently in the
+# image yum.conf and rpm macros

-# https://pagure.io/atomic-wg/issue/308
-printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
+# remove the user anaconda forces us to make
+userdel -r none
+
+LANG="en_US"
+echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
+
+# Carry these configs for both dnf and yum for users who are calling
+# yum-deprecated directly. This will keep the experience between both
+# consistent
+awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
+    < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
+
+awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
+    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
+mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
+
+echo "Import RPM GPG key"
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=$(uname -i)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+rm -f /usr/lib/locale/locale-archive
+
+#Setup locale properly
+localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
+
+rm -rf /var/cache/yum/*
+rm -f /tmp/ks-script*

 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service

-# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
 # Fix /run/lock breakage since it's not tmpfs in docker
-# This unmounts /run (tmpfs) and then recreates the files
-# in the /run directory on the root filesystem of the container
-#
-# We ignore the return code of the systemd-tmpfiles command because
-# at this point we have already removed the /etc/machine-id and all
-# tmpfiles lines with %m in them will fail and cause a bad return
-# code. Example failure:
-#   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
-#
 umount /run
-systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
-rm /run/nologin # https://pagure.io/atomic-wg/issue/316
+systemd-tmpfiles --create --boot
+
+rm -f /etc/machine-id

 %end
--- a/fedora-docker-common.ks
+++ b/fedora-docker-common.ks
@@ -1,74 +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://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,59 +0,0 @@
-
-%packages
-@firefox
-@kde-apps
-@kde-desktop
-@kde-media
-@kde-office
-@kde-telepathy
-@networkmanager-submodules
-
-### The KDE-Desktop
-
-### Browser
-falkon
-
-### fixes
-
-# use kde-print-manager instead of system-config-printer
-system-config-printer
-# make sure mariadb lands instead of MySQL (hopefully a temporary hack)
-mariadb-embedded
-mariadb-connector-c
-mariadb-server
-
-# minimal localization support - allows installing the kde-l10n-* packages
-system-config-language
-kde-l10n
-
-# unwanted packages from @kde-desktop
-# don't include these for now to fit on a cd
-desktop-backgrounds-basic
-kdeaccessibility*
-#-ktorrent			# kget has also basic torrent features (~3 megs)
-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
-#-amarok 			# ~23 megs (mysql-embedded etc.)
-kipi-plugins			# ~8 megs + drags in Marble
-#-kdeplasma-addons		# ~16 megs
-#-krusader			# ~4 megs
-
-# Additional packages that are not default in kde-* groups, but useful
-k3b				# ~15 megs
-#kdeartwork			# only include some parts of kdeartwork
-fuse
-mediawriter
-
-### space issues
-
-# admin-tools
-gnome-disk-utility
-# kcm_clock still lacks some features, so keep system-config-date around
-#-system-config-date
-# prefer kcm_systemd
-system-config-services
-# prefer/use kusers
-system-config-users
-
-## avoid serious bugs by omitting broken stuff
-
-%end
--- a/fedora-kde-minimization.ks
+++ b/fedora-kde-minimization.ks
@@ -1,8 +0,0 @@
-# remove input methods to free space
-%packages
-@input-methods
-scim*
-iok
-%end
-
-
--- a/fedora-kde-packages.ks
+++ b/fedora-kde-packages.ks
@@ -0,0 +1,29 @@
+%packages
+@firefox
+@kde-apps
+@kde-desktop
+@kde-media
+@kde-office
+@kde-telepathy
+@networkmanager-submodules
+
+### The KDE-Desktop
+
+### Browser
+qupzilla
+
+### fixes
+
+# use kde-print-manager instead of system-config-printer
+-system-config-printer
+# make sure mariadb lands instead of MySQL (hopefully a temporary hack)
+mariadb-embedded
+mariadb-libs
+mariadb-server
+
+# minimal localization support - allows installing the kde-l10n-* packages
+system-config-language
+kde-l10n
+
+%end
+
--- a/fedora-live-astronomy_kde.ks
+++ b/fedora-live-astronomy_kde.ks
@@ -14,8 +14,7 @@
 # Maintainer: Christian Dersch <lupinix@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Lupinix

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

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

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

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

 # misc. astronomy
 celestia
-stellarium
 virtualplanet

 # Some astro environment stuff
@@ -74,29 +66,17 @@ python3-ipython-notebook
 python3-sympy
 python3-networkx
 python3-pandas
-python3-pillow
-python3-seaborn
-python3-statsmodels
-python3-scikit-learn
-python3-scikit-image
 # Python 3 astronomy
-astropy-tools
-ginga
 python3-astropy
 python3-astroML
 python3-astroML-addons
 python3-astroquery
-python3-astroscrappy
 python3-APLpy
 python3-ATpy
 python3-ccdproc
-python3-fitsio
 python3-gatspy
 python3-photutils
-python3-pyvo
-python3-reproject
 python3-sep
-python3-wcsaxes

 # matplotlib backends
 python3-matplotlib-qt4
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -17,9 +17,8 @@ xconfig --startxonboot
 zerombr
 clearpart --all
 part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=sshd
+services --enabled=NetworkManager,ModemManager --disabled=network,sshd
 network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
 shutdown

 %include fedora-repo.ks
@@ -49,7 +48,6 @@ 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
@@ -57,6 +55,7 @@ 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 +173,7 @@ if [ -n "\$configdone" ]; then
  exit 0
 fi

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

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

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

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

 EOF

@@ -328,14 +321,6 @@ echo 'File created by kickstart. See systemd-update-done.service(8).' \
 # See bug 1317709
 rm -f /boot/*-rescue*

-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
 %end


@@ -347,5 +332,4 @@ 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-cinnamon.ks
+++ b/fedora-live-cinnamon.ks
@@ -8,7 +8,7 @@

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

 part / --size=6144

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

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

 %include fedora-live-workstation.ks

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

-# Provides backup application
-deja-dup
-deja-dup-nautilus
-
-# Add extra gnome applications
-gnome-books
-gnome-calendar
+# Preview Gnome Photos
 gnome-photos
-gnome-shell-extension-pomodoro
-gnome-todo

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

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

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

 # Add link to lists of tutorials
--- a/fedora-live-games.ks
+++ b/fedora-live-games.ks
@@ -45,14 +45,14 @@ extremetuxracer
 freeciv
 freecol
 freedoom
-freedroidrpg
+# freedroidrpg cut for size
 frozen-bubble
 gl-117
 glob2
 lincity-ng
 tmw
-#maniadrive - currently broken
-#maniadrive-music - has been retired
+maniadrive
+maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
@@ -60,13 +60,13 @@ netpanzer
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
-# supertux # Crashing
+supertux
 #supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
 # worminator # Would pull in fluid-soundfont-lite-patches
-warmux
+# warmux - Cut for size
 xmoto

 # traditional (small)
@@ -189,6 +189,7 @@ 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
-ardour5
+ardour4
 rosegarden4
 seq24
 muse
@@ -108,6 +108,7 @@ ladspa-vco-plugins
 #lv2 plugins
 lv2
 lv2-avw-plugins
+lv2-fil-plugins
 lv2-invada-plugins
 lv2-kn0ck0ut
 lv2-ll-plugins
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -3,7 +3,7 @@
 # mailto:kde@lists.fedoraproject.org

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

 %post

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

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

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

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

 # DVD payload
-part / --size=6500
+part / --size=6144
+
+
+%packages
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
+-desktop-backgrounds-basic
+-kdeaccessibility*
+#-ktorrent			# kget has also basic torrent features (~3 megs)
+-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
+#-amarok 			# ~23 megs (mysql-embedded etc.)
+-kipi-plugins			# ~8 megs + drags in Marble
+#-kdeplasma-addons		# ~16 megs
+#-krusader			# ~4 megs
+
+# Additional packages that are not default in kde-* groups, but useful
+k3b				# ~15 megs
+#kdeartwork			# only include some parts of kdeartwork
+fuse
+liveusb-creator
+
+# only include kdegames-minimal
+-kdegames
+kdegames-minimal
+
+### space issues
+
+# fonts (we make no bones about admitting we're english-only)
+wqy-microhei-fonts			# a compact CJK font, to replace:
+-naver-nanum-gothic-fonts		# Korean
+-vlgothic-fonts				# Japanese
+-adobe-source-han-sans-cn-fonts		# simplified Chinese
+-adobe-source-han-sans-tw-fonts 	# traditional Chinese
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
+#-stix-fonts		# mathematical symbols
+
+# remove input methods to free space
+-@input-methods
+-scim*
+-m17n*
+-ibus*
+-iok
+
+# save some space (from @standard)
+-make
+
+# admin-tools
+-gnome-disk-utility
+# kcm_clock still lacks some features, so keep system-config-date around
+#-system-config-date
+# prefer kcm_systemd
+-system-config-services
+# prefer/use kusers
+-system-config-users
+
+## avoid serious bugs by omitting broken stuff
+
+%end

 %post
 %end
--- a/fedora-live-lxde.ks
+++ b/fedora-live-lxde.ks
@@ -8,7 +8,7 @@

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

 %post
 # LXDE and LXDM configuration
--- a/fedora-live-lxqt.ks
+++ b/fedora-live-lxqt.ks
@@ -1,51 +0,0 @@
-# fedora-live-lxqt.ks
-#
-# Description:
-# – Fedora Live Spin with the LXQt desktop environment
-#
-# Maintainer(s):
-# – Christian Dersch <lupinix@fedoraproject.org>
-#
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-lxqt-common.ks
-
-%post
-# add initscript
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# set up autologin for user liveuser
-if [ -f /etc/sddm.conf ]; then
-sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
-sed -i 's/^#Session=.*/Session=lxqt.desktop/' /etc/sddm.conf
-else
-cat > /etc/sddm.conf << SDDM_EOF
-[Autologin]
-User=liveuser
-Session=lxqt.desktop
-SDDM_EOF
-fi
-
-# show liveinst.desktop on desktop and in menu
-sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
-
-# set up preferred apps 
-cat > /etc/xdg/libfm/pref-apps.conf << FOE 
-[Preferred Applications]
-WebBrowser=qupzilla.desktop
-FOE
-
-# no updater applet in live environment
-rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
-
-# make sure to set the right permissions and selinux contexts
-chown -R liveuser:liveuser /home/liveuser/
-restorecon -R /home/liveuser/
-
-EOF
-
-%end
-
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -4,11 +4,48 @@
 # mailto:desktop@lists.fedoraproject.org

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

 part / --size 6144

+%packages
+
+# Drop things for size
+-@3d-printing
+-brasero
+-colord
+-fedora-icon-theme
+-GConf2
+-gnome-bluetooth-libs
+-gnome-icon-theme
+-gnome-icon-theme-symbolic
+-gnome-software
+-gnome-themes
+-gnome-themes-standard
+-gnome-user-docs
+
+-@mate-applications
+-mate-icon-theme-faenza
+
+# Drop oversized fonts that aren't needed
+
+# Drop things that pull in perl
+
+# Dictionaries are big
+# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
+# strong preference to giving it a go on #fedora-desktop.
+# also see http://bugzilla.gnome.org/681084
+
+# Help and art can be big, too
+-gnome-user-docs
+-evolution-help
+
+# Legacy cmdline things we don't want
+-telnet
+
+%end
+
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF

@@ -21,9 +58,6 @@ fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop

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

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

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

 # scanning takes quite a bit of space :/
 -xsane
--- a/fedora-live-python-classroom.ks
+++ b/fedora-live-python-classroom.ks
@@ -1,9 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# The Workstion based Python Classroom Lab
-
-%include fedora-live-workstation.ks
-%include fedora-live-minimization.ks
-%include fedora-python-classroom-gnome-common.ks
--- a/fedora-live-robotics.ks
+++ b/fedora-live-robotics.ks
@@ -47,6 +47,7 @@ firefox

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

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

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

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

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

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

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

 %post

+# Rebuild initrd for Sugar boot screen
+KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
+/usr/sbin/plymouth-set-default-theme sugar
+/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
+# Get proper release naming in the control panel
+cat >> /boot/olpc_build << EOF
+Sugar on a Stick
+EOF
+cat /etc/fedora-release >> /boot/olpc_build
+
+# Add our activities to the favorites
+cat > /usr/share/sugar/data/activities.defaults << EOF
+org.laptop.WebActivity
+org.laptop.HelpActivity
+org.laptop.Chat
+org.laptop.sugar.ReadActivity
+org.laptop.sugar.GetBooksActivity
+org.laptop.AbiWordActivity
+org.laptop.TurtleArtActivity
+org.laptop.Calculate
+org.laptop.Clock
+org.laptop.ImageViewerActivity
+org.laptop.Memorize
+org.laptop.physics
+org.laptop.Pippy
+org.laptop.RecordActivity
+org.laptop.Oficina
+org.laptop.StopWatchActivity
+org.laptop.community.Finance
+org.laptop.community.TypingTurtle
+org.laptop.sugar.Jukebox
+org.laptop.Words
+org.eq.FotoToon
+org.gnome.Labyrinth
+com.laptop.Ruler
+org.sugarlabs.AbacusActivity
+org.sugarlabs.IRC
+org.sugarlabs.InfoSlicer
+org.sugarlabs.PortfolioActivity
+org.sugarlabs.StoryActivity
+org.sugarlabs.VisualMatchActivity
+com.garycmartin.Moon
+mulawa.Countries
+tv.alterna.Clock
+vu.lux.olpc.Maze
+vu.lux.olpc.Speak
+EOF
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/sugar
+DISPLAYMANAGER=/usr/sbin/lightdm
+EOF
+
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+
+# Don't use the default system user (in SoaS liveuser) as nick name
+# Disable the logout menu item in Sugar
+# Enable Sugar power management
+cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
+[org.sugarlabs.user]
+default-nick='disabled'
+
+[org.sugarlabs]
+show-logout=false
+
+[org.sugarlabs.power]
+automatic=true
+EOF
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
+
 cat >> /etc/rc.d/init.d/livesys << EOF
 # set up lightdm autologin
 sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -3,12 +3,8 @@
 # mailto:desktop@lists.fedoraproject.org

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

 part / --size 6656

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


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

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

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

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

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

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

--- a/fedora-lxde-packages.ks
+++ b/fedora-lxde-packages.ks
@@ -43,7 +43,8 @@ metacity
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
-PackageKit*                # we switched to dnfdragora, so we don't need this
+-realmd                     # only seems to be used in GNOME
+-PackageKit*                # we switched to yumex, so we don't need this
 -foomatic-db-ppds
 -foomatic
 -stix-fonts
--- a/fedora-lxqt-common.ks
+++ b/fedora-lxqt-common.ks
@@ -1,52 +0,0 @@
-# fedora-lxqt-common.ks
-#
-# Description:
-# – Fedora Live Spin with the LXQt desktop environment
-#
-# Maintainer(s):
-# – Christian Dersch <lupinix@fedoraproject.org>
-#
-
-%packages
-@lxqt
-@lxqt-apps
-@lxqt-media
-@networkmanager-submodules
-
-# for nm applet
-gnome-keyring
-
-
-# l10n
-lxqt-l10n
-lximage-qt-l10n
-obconf-qt-l10n
-pavucontrol-qt-l10n
-
-# MP3
-gstreamer1-plugin-mpg123
-
-# remove unneeded stuff to get a lightweight system
-# fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts          # a compact CJK font, to replace:
-naver-nanum-gothic-fonts       # Korean
-vlgothic-fonts             # Japanese
-adobe-source-han-sans-cn-fonts     # simplified Chinese
-adobe-source-han-sans-tw-fonts     # traditional Chinese
-
-paratype-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge
-#-stix-fonts        # mathematical symbols
-
-# remove input methods to free space
-@input-methods
-scim*
-m17n*
-ibus*
-iok
-
-# Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132
-# Why is this not pulled in by anaconda???
-storaged
-
-%end
-
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -1,4 +1,6 @@
 %packages
+-PackageKit*                # we switched to yumex, so we don't need this
+firefox
@mate
 compiz
 compiz-plugins-main
@@ -14,11 +16,27 @@ emerald-themes
 emerald
 fusion-icon
@networkmanager-submodules
+blueman

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

+# more backgrounds
+f24-backgrounds-base
+f24-backgrounds-mate
+f24-backgrounds-extras-base
+
+# system tools
+system-config-printer
+system-config-printer-applet
+lightdm-gtk-greeter-settings
+
+# audio video
+parole
+exaile
+PackageKit-gstreamer-plugin
+
 # blacklist applications which breaks mate-desktop
 -audacious

@@ -28,28 +46,12 @@ mate-disk-usage-analyzer
 # dsl tools
 rp-pppoe

+# some tools
+p7zip
+p7zip-plugins
+
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns

-# Drop things for size
-@3d-printing
-brasero
-colord
-fedora-icon-theme
-gnome-icon-theme
-gnome-icon-theme-symbolic
-gnome-software
-gnome-user-docs
-
-@mate-applications
-mate-icon-theme-faenza
-
-# Help and art can be big, too
-gnome-user-docs
-evolution-help
-
-# Legacy cmdline things we don't want
-telnet
-
 %end
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@@ -1,19 +0,0 @@
-%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
@@ -1,27 +0,0 @@
-%include fedora-arm-base.ks
-
-# server defaults to xfs for / so lets do so on arm also
-part / --size=2500 --fstype xfs
-
-%packages
-# install the default groups for the server evironment since installing the environment is not working
-@server-product
-@standard
-@headless-management
-@container-management
-@domain-client
-initial-setup-gui
-generic-release*
-fedora-modular-release
-%end
-
-%post
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-%end
-
--- a/fedora-modular-container-base-minimal.ks
+++ b/fedora-modular-container-base-minimal.ks
@@ -1,70 +0,0 @@
-# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
-# This base is a stripped back Fedora image without python3/dnf.
-# If you need that use the standard base image.
-
-%include fedora-modular-container-common.ks
-
-%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
-microdnf
-
-%end
-
-%post --erroronfail --log=/root/anaconda-post.log
-# remove some random help txt files
-rm -fv usr/share/gnupg/help*.txt
-
-# Pruning random things
-rm usr/lib/rpm/rpm.daily
-rm -rfv usr/lib64/nss/unsupported-tools/  # unsupported
-
-# Statically linked crap
-rm -fv usr/sbin/{glibc_post_upgrade.x86_64,sln}
-ln usr/bin/ln usr/sbin/sln
-
-# Remove some dnf info
-rm -rfv /var/lib/dnf
-
-# don't need icons
-rm -rfv /usr/share/icons/*
-
-#some random not-that-useful binaries
-rm -fv /usr/bin/pinky
-
-# we lose presets by removing /usr/lib/systemd but we do not care
-rm -rfv /usr/lib/systemd
-
-# if you want to change the timezone, bind-mount it from the host or reinstall tzdata
-rm -fv /etc/localtime
-mv /usr/share/zoneinfo/UTC /etc/localtime
-rm -rfv  /usr/share/zoneinfo
-
-# Final pruning
-rm -rfv /var/cache/* /var/log/* /tmp/*
-
-%end
-
-%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
-set -eux
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
-# Fix /run/lock breakage since it's not tmpfs in container
-# This unmounts /run (tmpfs) and then recreates the files
-# in the /run directory on the root filesystem of the container
-# NOTE: run this in nochroot because "umount" does not exist in chroot
-umount /mnt/sysimage/run
-# The file that specifies the /run/lock tmpfile is
-# /usr/lib/tmpfiles.d/legacy.conf, which is part of the systemd
-# rpm that isn't included in this image. We'll create the /run/lock
-# file here manually with the settings from legacy.conf
-# NOTE: chroot to run "install" because it is not in anaconda env
-chroot /mnt/sysimage install -d /run/lock -m 0755 -o root -g root
-
-
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
-# NOTE: run this in nochroot because "find" does not exist in chroot
-KEEPLANG=en_US
-for dir in locale i18n; do
-    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
-done
-
-%end
--- a/fedora-modular-container-base.ks
+++ b/fedora-modular-container-base.ks
@@ -1,38 +0,0 @@
-# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
-# This base is a standard Fedora image with python3 and dnf
-
-%include fedora-modular-container-common.ks
-
-%packages --excludedocs --instLangs=en --nocore
-rootfiles
-tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
-vim-minimal
-dnf
-dnf-yum  # https://pagure.io/fesco/ticket/1312#comment:29
-sssd-client
-
-%end
-
-%post --erroronfail --log=/root/anaconda-post.log
-# remove some extraneous files
-rm -rf /var/cache/dnf/*
-rm -rf /tmp/*
-
-#Mask mount units and getty service so that we don't get login prompt
-systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
-# Fix /run/lock breakage since it's not tmpfs in container
-# This unmounts /run (tmpfs) and then recreates the files
-# in the /run directory on the root filesystem of the container
-#
-# We ignore the return code of the systemd-tmpfiles command because
-# at this point we have already removed the /etc/machine-id and all
-# tmpfiles lines with %m in them will fail and cause a bad return
-# code. Example failure:
-#   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
-#
-umount /run
-systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
-
-%end
--- a/fedora-modular-container-common.ks
+++ b/fedora-modular-container-common.ks
@@ -1,75 +0,0 @@
-# This is the common bits between Container base images based on Modular Fedora.
-#
-# To keep this image minimal it only installs English language. You need to change
-# dnf configuration in order to enable other languages.
-#
-# ##  Hacking on this image ###
-# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
-# but you can run imagefactory locally too.
-#
-# To do so, testing local changes, first you'll need a TDL file.  I store one here:
-# https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
-#
-# Then, once you have imagefactory and imagefactory-plugins installed, run:
-#
-#   ksflatten -c fedora-modular-base[-minimal].ks -o fedora-modular-base-test.ks
-#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-modular-base-test.ks modular
-#
-
-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
-bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-keyboard us
-network --bootproto=dhcp --device=link --activate --onboot=on
-reboot
-
-# boot partitions are irrelevant as the final container image is a tarball
-zerombr
-clearpart --all
-autopart --nohome --noswap --nolvm
-
-%packages --excludedocs --instLangs=en --nocore
-fedora-modular-release
-bash
-coreutils-single
-glibc-minimal-langpack
-libcrypt
-rpm
-shadow-utils
-sssd-client
-util-linux
-kernel
-dosfstools
-e2fsprogs
-fuse-libs
-gnupg2-smime
-libss # used by e2fsprogs
-libusbx
-pinentry
-shared-mime-info
-trousers
-xkeyboard-config
-
-%end
-
-%post --erroronfail --log=/root/anaconda-post.log
-set -eux
-
-# Set install langs macro so that new rpms that get installed will
-# only install langs that we limit it to.
-LANG="en_US"
-echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
-echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
-
-echo "# fstab intentionally empty for containers" > /etc/fstab
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-%end
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@@ -1,81 +0,0 @@
-text
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-# Disabled for modular compose (for now)
-#firewall --enabled --service=mdns
-# Disabled for modular compose (for now)
-#services --enabled=sshd,NetworkManager,chronyd,initial-setup
-network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
-shutdown
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-zerombr
-clearpart --all --initlabel --disklabel=msdos
-autopart --type=plain
-
-# make sure that initial-setup runs and lets us do all the configuration bits
-firstboot --reconfig
-
-%include fedora-repo.ks
-
-%packages --excludedocs --excludeWeakdeps --nocore
-bash
-fedora-modular-release
-filesystem
-coreutils-single
-util-linux
-rpm
-shadow-utils
-microdnf
-glibc-minimal-langpack
-grubby
-kernel
-libcrypt
-sssd-client
-dhcp-client
-fedora-logos
-coreutils
-dosfstools
-e2fsprogs
-fuse-libs
-gnupg2-smime
-libss # used by e2fsprogs
-libusbx
-pinentry
-shared-mime-info
-trousers
-xkeyboard-config
-dracut
-%end
-
-%post
-
-# Setup Raspberry Pi firmware
-#cp -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
@@ -1,22 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# Common packages of all Python Classroom images
-
-%packages
-@python-classroom
-@python-science
-nano
-openssh-clients
-vim-enhanced
-wget
-
-# Remove Pythons possibly recommended by tox
-python26
-python33
-python34
-python35
-pypy
-
-%end
--- a/fedora-python-classroom-gnome-common.ks
+++ b/fedora-python-classroom-gnome-common.ks
@@ -1,103 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# GNOME part of Python Classroom images
-
-%include fedora-python-classroom-common.ks
-
-%packages
-ninja-ide
-emacs
-python3-matplotlib-tk
-python3-pillow-tk
-
-# Remove extra gnome-y things
-@graphical-internet
-@games
-@sound-and-video
-@multimedia
-dleyna*
-gnome-boxes
-gnome-calendar
-gnome-clocks
-gnome-contacts
-gnome-disk-utility
-gnome-documents
-gnome-font-viewer
-gnome-maps
-gnome-photos
-gnome-weather
-grilo-plugins
-cheese
-totem
-totem-nautilus
-
-# This is no longer workstation
-@workstation-product
-
-# Add a web browser
-@firefox
-
-# Remove office suite
-@libreoffice
-libreoffice-*
-planner
-
-# Drop the Java plugin and Java
-icedtea-web
-java*
-
-# No printing
-@printing
-foomatic-db-ppds
-foomatic
-
-# Dictionaries are big
-aspell-*
-words
-
-# Help and art can be big, too
-gnome-user-docs
-gnome-getting-started-docs
-desktop-backgrounds-basic
-*backgrounds-extras
-
-# Legacy cmdline things we don't want
-krb5-auth-dialog
-krb5-workstation
-pam_krb5
-quota
-dos2unix
-finger
-ftp
-jwhois
-mtr
-pinfo
-rsh
-nfs-utils
-ypbind
-yp-tools
-rpcbind
-acpid
-ntsysv
-
-# Don't need this
-linux-atm
-
-# Drop some system-config things
-system-config-language
-system-config-network
-system-config-rootpassword
-system-config-services
-policycoreutils-gui
-
-%end
-
-
-%post
-
-#Override the favorite desktop application in Dash
-sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'anaconda.desktop']/" /etc/rc.d/init.d/livesys
-
-%end
--- a/fedora-python-classroom-vagrant.ks
+++ b/fedora-python-classroom-vagrant.ks
@@ -1,8 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# Like the Python Classroom image, but tuned for vagrant.
-
-%include fedora-cloud-base-vagrant.ks
-%include fedora-python-classroom-common.ks
--- a/fedora-repo-not-rawhide.ks
+++ b/fedora-repo-not-rawhide.ks
@@ -1,4 +1,4 @@
-repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
--- a/fedora-repo-rawhide.ks
+++ b/fedora-repo-rawhide.ks
@@ -1,2 +1,2 @@
-repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented

 # For the master branch the following should be uncommented
-%include fedora-repo-rawhide.ks
+# %include fedora-repo-rawhide.ks

 # For non-master branches the following should be uncommented
-# %include fedora-repo-not-rawhide.ks
+%include fedora-repo-not-rawhide.ks
--- a/fedora-scientific-common.ks
+++ b/fedora-scientific-common.ks
@@ -1,157 +0,0 @@
-%packages
-
-# Installing the default/mandatory packages from engineering & scientific
-@engineering-and-scientific
-
-# scilab
-scilab
-scilab-devel
-scilab-doc
-
-# Remove sagemath explicitly?
-sagemath
-
-#Devel tools
-
-#Install the mandatory packages from dev-tools and dev-libs
-# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
-@development-tools
-@development-libs
-@c-development
-@rpm-development-tools
-#others, not included
-# C++ libraries
-blitz-devel
-armadillo-devel
-
-# Misc. related utils
-ddd
-valgrind
-
-#python 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
@@ -1,12 +0,0 @@
-# Fedora Scientific  Vagrant box
-
-# Fedora Scientific: For researchers in Science and Engineering
-# Fedora-Scientific aims to create a Fedora which has the generic
-# toolset for the researcher
-# Web: https://labs.fedoraproject.org/en/scientific/
-
-# Maintainer: Amit Saha <amitksaha@fedoraproject.org>
-#             https://fedoraproject.org/wiki/User:Amitksaha
-
-%include fedora-cloud-base-vagrant.ks
-%include fedora-scientific-common.ks
--- a/fedora-soas-common.ks
+++ b/fedora-soas-common.ks
@@ -1,168 +0,0 @@
-# fedora-livecd-soas.ks
-#
-# Description:
-# - A Sugar environment that you can carry in your pocket
-#
-# Maintainers:
-# - Peter Robinson <pbrobinson AT gmail DOT com>
-
-firewall --enabled --service=mdns,presence
-
-%packages
-@fonts
-@dial-up
-@multimedia
-@printing
-foomatic
-@gnome-desktop 
-yp-tools
-ypbind
-rdate
-rdist
-icedtea-web
-firefox
-glx-utils
-nmap-ncat
-PackageKit
-eekboard-libs
-open-vm-tools*
-gfs2-utils
-abrt-cli
-ibus*
-hyperv-daemons
-webkit2gtk3-plugin-process-gtk2
-
-# Add some extra fonts
-dejavu-sans-fonts
-dejavu-sans-mono-fonts
-madan-fonts
-aajohan-comfortaa-fonts
-sil-abyssinica-fonts
-vlgothic-fonts
-
-# == Core Sugar Platform ==
-@sugar-desktop
-sugar-ruler
-sugar-cp-updater
-lightdm
-lightdm-gtk
-
-# Write breaks unless we do this (we don't need it anyway)
-# enable for testing in the F17 dev cycle
-@input-methods
-
-# Needed for wifi, bluetooth and WWAN connection support
-@networkmanager-submodules
-
-# == Platform Components ==
-# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
-alsa-plugins-pulseaudio
-alsa-utils
-gstreamer1-plugins-base
-gstreamer1-plugins-good
-gstreamer1-plugins-bad-free
-gstreamer-plugins-espeak
-pulseaudio
-pulseaudio-utils
-
-# explicitly remove openbox and hopefully deal with what firstboot wants
-openbox
-
-# remove deps that come from god knows where
-sane-backends
-sane-backends-drivers-scanners
-
-# Usefulness for DSL connections as per:
-# http://bugs.sugarlabs.org/ticket/1951
-rp-pppoe
-
-# 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
-cat > /usr/share/sugar/data/activities.defaults << EOF
-org.laptop.WebActivity
-org.laptop.HelpActivity
-org.laptop.Chat
-org.laptop.sugar.ReadActivity
-org.laptop.sugar.GetBooksActivity
-org.laptop.AbiWordActivity
-org.laptop.TurtleArtActivity
-org.laptop.Calculate
-org.laptop.Clock
-org.laptop.ImageViewerActivity
-org.laptop.Memorize
-org.laptop.physics
-org.laptop.Pippy
-org.laptop.RecordActivity
-org.laptop.Oficina
-org.laptop.StopWatchActivity
-org.laptop.community.Finance
-org.laptop.community.TypingTurtle
-org.laptop.sugar.Jukebox
-org.laptop.Words
-org.eq.FotoToon
-org.gnome.Labyrinth
-com.laptop.Ruler
-org.sugarlabs.AbacusActivity
-org.sugarlabs.IRC
-org.sugarlabs.InfoSlicer
-org.sugarlabs.PortfolioActivity
-org.sugarlabs.StoryActivity
-org.sugarlabs.VisualMatchActivity
-com.garycmartin.Moon
-mulawa.Countries
-tv.alterna.Clock
-vu.lux.olpc.Maze
-vu.lux.olpc.Speak
-EOF
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/sugar
-DISPLAYMANAGER=/usr/sbin/lightdm
-EOF
-
-# set up lightdm autologin
-sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
-sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
-
-# Don't use the default system user (in SoaS liveuser) as nick name
-# Disable the logout menu item in Sugar
-# Enable Sugar power management
-cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
-[org.sugarlabs.user]
-default-nick='disabled'
-
-[org.sugarlabs]
-show-logout=false
-
-[org.sugarlabs.power]
-automatic=true
-EOF
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
-
-%end
--- a/fedora-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -0,0 +1,86 @@
+# fedora-livecd-soas.ks
+#
+# Description:
+# - A Sugar environment that you can carry in your pocket
+#
+# Maintainers:
+# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Mel Chua <mchua AT fedoraproject DOT org>
+
+%packages
+-@fonts
+-@dial-up
+-@multimedia
+-@printing
+-foomatic
+-@gnome-desktop 
+-yp-tools
+-ypbind
+-rdate
+-rdist
+-icedtea-web
+-firefox
+-glx-utils
+-nmap-ncat
+-PackageKit
+-libfprint
+-realmd
+-eekboard-libs
+-open-vm-tools*
+-gfs2-utils
+-abrt-cli
+-ibus*
+-hyperv-daemons
+-webkitgtk4-plugin-process-gtk2
+
+# Add some extra fonts
+dejavu-sans-fonts
+dejavu-sans-mono-fonts
+madan-fonts
+aajohan-comfortaa-fonts
+sil-abyssinica-fonts
+vlgothic-fonts
+
+# == Core Sugar Platform ==
+@sugar-desktop
+-sugar-ruler
+sugar-cp-updater
+lightdm
+lightdm-gtk
+
+# Write breaks unless we do this (we don't need it anyway)
+# enable for testing in the F17 dev cycle
+@input-methods
+
+# Needed for wifi, bluetooth and WWAN connection support
+@networkmanager-submodules
+
+# == Platform Components ==
+# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
+alsa-plugins-pulseaudio
+alsa-utils
+gstreamer1-plugins-base
+gstreamer1-plugins-good
+gstreamer1-plugins-bad-free
+gstreamer-plugins-espeak
+pulseaudio
+pulseaudio-utils
+
+# explicitly remove openbox and hopefully deal with what firstboot wants
+-openbox
+
+# remove deps that come from god knows where
+-sane-backends
+-sane-backends-drivers-scanners
+
+# Usefulness for DSL connections as per:
+# http://bugs.sugarlabs.org/ticket/1951
+rp-pppoe
+
+# Get the Sugar boot screen
+-plymouth-system-theme
+-plymouth-theme-charge
+sugar-logos
+
+%end
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -20,6 +20,9 @@
@printing
@workstation-product

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

 # save some space
@@ -36,8 +38,9 @@ system-config-printer
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
+-realmd                     # only seems to be used in GNOME
+-PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
 -xfce4-sensors-plugin
-foomatic-db-ppds

 %end
--- a/l10n/fedora-livecd-cinnamon-de_DE.ks
+++ b/l10n/fedora-livecd-cinnamon-de_DE.ks
@@ -1,20 +0,0 @@
-# fedora-livecd-cinnamon-de_DE.ks
-#
-# Description:
-# - German Fedora Live Spin with the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Björn Esser <besser82@fedoraproject.org>
-
-%include ../fedora-live-cinnamon.ks
-
-lang de_DE.UTF-8
-keyboard de-latin1-nodeadkeys
-timezone Europe/Berlin
-
-%packages
-@german-support
-# exclude input methods
-m17n*
-scim*
-%end
--- a/l10n/fedora-livecd-cinnamon-ja_JP.ks
+++ b/l10n/fedora-livecd-cinnamon-ja_JP.ks
@@ -1,35 +0,0 @@
-# fedora-livecd-cinnamon-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
-
-%include ../fedora-live-cinnamon.ks
-
-lang ja_JP.UTF-8
-keyboard jp
-timezone Asia/Tokyo
-
-%packages
-@japanese-support
-# exclude input methods except ibus:
-m17n*
-scim*
-iok
-%end
-
-%post
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-%end
-
--- a/l10n/fedora-livecd-lxde-ja_JP.ks
+++ b/l10n/fedora-livecd-lxde-ja_JP.ks
@@ -1,61 +0,0 @@
-# fedora-livecd-lxde-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the LXDE Desktop Environment
-#
-# Maintainer(s):
-# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
-
-%include ../fedora-live-lxde.ks
-
-lang ja_JP.UTF-8
-keyboard jp
-timezone Asia/Tokyo
-
-%packages
-@japanese-support
-# exclude input methods:
-m17n*
-scim*
-ibus*
-iok
-# Better more popular browser
-firefox
-# ibus stuff
-ibus-kkc
-imsettings
-%end
-
-%post
-cat >> /etc/rc.d/init.d/livesys << EOF
-#### setting env and start ibus-deamon ####
-#mkdir /home/liveuser
-cat >> /home/liveuser/.bash_profile << FOE
-export XMODIFIERS="@im=ibus"
-export GTK_IM_MODULE=ibus
-export QT_IM_MODULE=ibus
-ibus-daemon -drx
-FOE
-#### autostart ibus and stuff ####
-cat > /etc/xdg/autostart/imsettings-start.desktop << "FOE"
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Version=1.0
-Name=Input Method starter
-Name[ja]=入力メソッドのスターター
-Exec=imsettings-switch -n -q -x
-Terminal=false
-FOE
-EOF
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-%end
--- a/l10n/fedora-livecd-xfce-ja_JP.ks
+++ b/l10n/fedora-livecd-xfce-ja_JP.ks
@@ -1,38 +0,0 @@
-# fedora-livecd-xfce-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the Xfce Desktop Environment
-#
-# Maintainer(s):
-# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
-
-%include ../fedora-live-xfce.ks
-
-lang ja_JP.UTF-8
-keyboard jp
-timezone Asia/Tokyo
-
-%packages
-@japanese-support
-# exclude input methods except ibus:
-m17n*
-scim*
-iok
-
-# ibus-kkc 
-ibus-kkc
-%end
-
-%post
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-%end
-
--- a/snippets/packagekit-cached-metadata.ks
+++ b/snippets/packagekit-cached-metadata.ks
@@ -19,22 +19,22 @@ PK_PREFIX=`mktemp -d`
 mkdir -p $PK_PREFIX/etc/yum.repos.d
 if [ -f /etc/yum.repos.d/fedora.repo ] ; then
  cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \
         $PK_PREFIX/etc/yum.repos.d/fedora.repo
 fi
 if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then
  cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \
         $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo
 fi
 if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then
  cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \
         $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo
 fi
 if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then
  cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \
         $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo
 fi
 rpm --root=$PK_PREFIX --initdb
Author	SHA1	Message	Date
Adam Miller	a550d62548	add tar to address BZ#1409920 Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>	2017-01-04 15:36:56 -06:00
Jan Pazdziora	7afda9537f	1343136 - the default OOMScoreAdjust=-900 does not cause any ill effects on fedora. (cherry picked from commit `1a5dea70fc`)	2016-09-20 18:20:28 +02:00
Jason Brooks	7e4f164444	correct ostree repo location see: https://pagure.io/fedora-kickstarts/pull-request/38#comment-8056	2016-08-13 13:25:32 -05:00
Bruno Wolff III	1cdbd3ef07	Make sure chronyd runs with the correct config We need to have chronyd start after livesys has finished so that the config for chronyd gets rewritten before it starts. If not it will overwrite the system clock with a time that will be incorrect (US eastern stored as local time instead of UTC) for most people. This fixes bug 1018162.	2016-08-04 07:43:46 -05:00
Jason Brooks	e640139976	fix ostree repo location problem: fedora atomic host images are including an old ostree tree (24.39 from 2016-06-15 09:57:04) cause: The ostree repo specified in this file at: https://kojipkgs.fedoraproject.org/compose/atomic/24/ was last updated at 2016-06-15 09:57:04. Fedora Atomic 23 used the location: https://kojipkgs.fedoraproject.org/mash/atomic/23/. The ref at the similar https://kojipkgs.fedoraproject.org/mash/atomic/24/ was last modifed 2016-07-24. This seems to be the correct location. Or, if the switch from mash to compose is right, then we need to ensure that the compose location is updated / kept up to date.	2016-07-27 10:36:46 -07:00
Adam Miller	fb34ac6186	fix missing /run/lock in docker base image BZ#1343138 Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>	2016-07-22 16:04:40 -05:00
Dan Book	03020f4a74	Cinnamon - correct gnome metadata for extra backgrounds and add basic backgrounds	2016-06-07 21:03:21 -04:00
Kevin Fenzi	cd2ff0eea2	Drop dracut-config-generic since we don't want the larger generic initramfses on all installed from live instances. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2016-06-03 12:09:10 -07:00
Kalev Lember	ee9e070d75	packagekit-cached-metadata.ks: Adapt for livemedia-creator changes Now that F24 images are made with livemedia-creator instead of livecd-creator, the kickstart parser has changed; the new kickstart parser doesn't understand the $INSTALL_ROOT variable we'd been using in %post --nochroot scripts. This commit fixes this by replacing $INSTALL_ROOT usage with hardcoded /mnt/sysimage as docs suggest. While at this, this commit also fixes a case where resolv.conf would be incorrectly copied if it is a symlink, thanks to dgilmore for pointing this out.	2016-06-01 23:20:46 +02:00
Dennis Gilmore	a769fe0a58	install new arm-tools group to pull in tools for booting arm systems. Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-05-30 10:10:29 -05:00
Christian Dersch	dbf41eb0b0	astronomy: remove astronomy-bookmarks (outdated and affected by #1338010 )	2016-05-27 09:57:53 +02:00
Dennis Gilmore	f086a341da	add a default url line to the livecd kickstarts Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-05-23 09:36:29 -05:00
Christian Dersch	9714319110	astronomy: added plasma applet for redshift	2016-05-21 15:11:26 +02:00
Dusty Mabe	df302e6748	fedora-cloud-base: Add which package back. After removing grub2 the which package gets removed. Let's add it back because it is generally useful and because it is needed for many vagrant utilities to work.	2016-05-20 10:53:04 -04:00
Peter Robinson	558f5c6315	arm: add fedora-arm-installer	2016-05-17 13:51:48 +01:00
Peter Robinson	f0fdf7c568	cloud: ppc: add grub2 explicitly since now primary has explicitly removed it again	2016-05-17 12:04:21 +01:00
Christian Dersch	302f5ad386	astronomy: removed skychart, do not ship two complete Python stacks => removed python 2 scientific stuff	2016-05-16 14:09:42 +02:00
Dan Book	e891c467f0	remove unneeded keyring package; add yumex-dnf and extra backgrounds - gnome-keyring-pam is already required by cinnamon	2016-05-13 22:05:23 -05:00
Peter Robinson	6105897461	aarch64: fix cloud ks	2016-05-13 17:57:18 +01:00
raveit65	d003cb2a7d	Mate: add p7zip	2016-05-13 11:01:12 +02:00
Peter Robinson	f8593bceab	arm: minimal: add WiFi cli support	2016-05-12 16:33:02 +01:00
Peter Robinson	6eab7f1b6a	cloud: aarch64: fix console line	2016-05-12 08:47:30 +01:00
Peter Robinson	2264e6daa9	aarch64: cloud: explicitly add uEFI boot components	2016-05-10 16:36:34 +01:00
Christian Dersch	24e3e25f16	astronomy: added virtualplanet and redshift	2016-05-10 14:16:13 +02:00
raveit65	a4495045d0	Mate: use f24-backgrounds-extras-base	2016-05-10 11:10:52 +02:00
Luya Tshimbalanga	17bed3db91	design-suite: really enable gthumb	2016-05-04 19:39:43 -07:00
Adam Williamson	f4ee7648ad	Revert "cloud-base-vagrant: Add sshfs to support vagrant-sshfs plugin" This reverts commit `34a505db5c`. The package is not in the Cloud install root at present so this change made the image compose fail. This can be re-applied if the package is added to an appropriate comps group.	2016-05-03 22:54:53 -07:00
Dusty Mabe	3992f9ca91	cloud-base-vagrant: use extlinux to match cloud-base If we don't do this it will try to use grub2 but will fail because we removed the packages from the package set.	2016-05-03 17:36:30 -05:00
Dusty Mabe	34a505db5c	cloud-base-vagrant: Add sshfs to support vagrant-sshfs plugin Adding sshfs into the image will make it so that users won't have to wait for the package to be installed on bringup.	2016-05-03 17:35:16 -05:00
Luya Tshimbalanga	dc22ec46cb	design-suite: bring back f24-backgrounds-extras	2016-05-03 14:56:27 -07:00
Luya Tshimbalanga	dec45f8d97	design-suite: remove erronous typo	2016-05-03 10:25:03 -07:00
Kalev Lember	80d15bf8ba	packagekit-cached-metadata.ks: Update Branched and Rawhide repo URLs They changed with the switch to Pungi.	2016-05-03 15:16:50 +02:00
Luya Tshimbalanga	1ef06b2533	design-suite: temporary disable f24-backgrounds-extras for testing purpose	2016-05-02 11:16:30 -07:00
Bruno Wolff III	71fb82b5bc	Games: I still need to get the i686 size down another 100 MB Hopefully eventually Midori will get fixed, so firefox can be dropped and we'll find a way to get the i686 version not to be 400 MB larger than the x86_64 version.	2016-04-29 13:54:04 -05:00
Kevin Fenzi	11a93ac029	Add admin-tools group in. Fixes bug #1330298	2016-04-26 15:06:58 -06:00
Luya Tshimbalanga	4407d70045	Merge branch 'f24' of ssh://git.fedorahosted.org/git/spin-kickstarts into f24	2016-04-26 12:36:48 -07:00
Luya Tshimbalanga	ab8bfa2903	design-suite: add f24-backgrounds extras and switch geeqie to gthumb	2016-04-26 12:34:01 -07:00
Bruno Wolff III	37bbc185a5	Games also cut Ri-li for size	2016-04-25 00:19:04 -05:00
Bruno Wolff III	125b994038	Games: don't block firefox With no sign of midori getting fixed, let firefox get used for beta. The kernel / change to livemedia had more to do with the size problem, than firefox did. With the removal of freedroid and letting firefox go the size should be very close.	2016-04-24 23:54:51 -05:00
Bruno Wolff III	d9a3ca9946	Games: need to save 20MB on i686 With livemedia putting both PAE and non-PAE kernels on i686, i686 images are a lot bigger than x86_64 images and what i686 used to be. Removing freedroid looks to be enough.	2016-04-24 23:51:57 -05:00
Luya Tshimbalanga	1016065d6b	design-suite: add geeqie	2016-04-21 01:40:52 -07:00
Kushal Das	8c2a31f378	Pulls in the systemd-udev subpackage	2016-04-13 15:25:52 +05:30
Dennis Gilmore	e1206f4b9b	update the atomic cloud images for f24 Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-04-12 10:07:32 -05:00
Peter Robinson	7f13b20e33	Docker: Base: add arm config, use includes for ppc config	2016-04-12 15:44:02 +01:00
Peter Robinson	6226c24d43	Cloud: Base: add arm config, use includes for ppc config	2016-04-12 14:22:27 +01:00
Peter Robinson	b4d8fed0e8	SoaS: we don't want the WebKit gtk2 plugin support	2016-04-10 22:41:43 +01:00
raveit65	de041f9852	update fedora-mate-packages.ks	2016-04-09 17:12:51 +02:00
Peter Robinson	7b9bef18d0	SoaS: Don't include livecd-tools anymore	2016-03-30 14:57:07 +01:00
Kevin Fenzi	802b718d0d	Allow dracut-config-rescue to be installed so installed systems have a rescue kernel. Also remove the rescue kernel and initramfs on the live itself. Fixes bug #1317709	2016-03-25 12:37:29 -06:00
Christian Dersch	c4326802f6	astronomy: increased space	2016-03-24 20:53:12 +01:00
Peter Robinson	fb5d41231c	ppc: we need grub2 in cloud images	2016-03-24 17:25:05 +00:00
Peter Robinson	3d38aa7715	add PPC specific cloud kickstarts until anaconda rhbz 1303219 is fixed	2016-03-24 16:41:13 +00:00
Luya Tshimbalanga	5b062b29c6	desing-suite: increase recommended size	2016-03-23 23:37:01 -07:00
Dennis Gilmore	55890d6209	make the arm KDE image 6.5G, needs more space Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-03-14 20:34:33 -05:00
Dennis Gilmore	533fa0ccda	point at f24 repo Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-03-13 21:17:56 -05:00
Christian Dersch	c53c695e25	astronomy: added veusz to have a proper replacement for scidavis	2016-03-13 20:29:05 +01:00
Adam Williamson	23af1c94df	Revert "Revert "add @gnome-desktop to fedora-workstation-packages"" This reverts commit `a08e27a87d`. Requested by Michael Catanzaro, he is re-applying the Workstation comps group change that was reverted.	2016-03-12 10:27:35 -08:00
Bruno Wolff III	3ddd549ff7	Games: Don't pull in firefox to keep size down	2016-03-12 10:30:57 -06:00
Christian Dersch	92cbaff664	astronomy: removed broken xvarstar	2016-03-12 13:07:27 +01:00
raveit65	ef88d6ddbd	Mate: clean up fedora-mate-packages.ks	2016-03-12 00:30:02 +01:00
Kevin Fenzi	8c971991de	Switch default browser to firefox on Xfce	2016-03-10 13:18:53 -07:00
Rex Dieter	103d925e9b	kde-desktop: +qupzilla, use @firefox group	2016-03-08 07:08:14 -06:00
Peter Robinson	410101bd76	Nuke random seed in install for ARM images too, the new instance should make it's own. Fixes bug #1314879	2016-03-07 08:42:51 -06:00
Dennis Gilmore	179a268857	Revert "Merge branch 'master' into f24" This reverts commit `eead7177ab`, reversing changes made to `b9fcda35df`.	2016-03-07 08:40:39 -06:00
Christian Dersch	ccc8847b19	astronomy: kst fixed, added again	2016-03-06 13:57:45 +01:00
Peter Robinson	eead7177ab	Merge branch 'master' into f24	2016-03-05 17:44:39 +00:00
Kevin Fenzi	b9fcda35df	Nuke random seed in install, the new instance should make it's own. Fixes bug #1314879	2016-03-05 09:27:39 -07:00
Kalev Lember	f4e8f1bb0a	Revert "add @gnome-desktop to fedora-workstation-packages" @gnome-desktop addition was reverted in comps in commit db13483cc5bdb39b8d9f066e7706335fb9ae3048; this reverts it here too. This reverts commit `6b42371f72`.	2016-03-04 12:55:12 +01:00
Christian Dersch	9199268aed	astronomy: added LabPlot as replacement for retired scidavis	2016-03-03 17:54:58 +01:00
Dennis Gilmore	26768920ec	fedira install trees are now defined in pungi-fedora Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-03-02 11:16:55 -06:00
Christian Dersch	c254d4e73e	astronomy: disabled kst until dependency issue with gsl 2.1 is fixed	2016-03-02 01:32:13 +01:00
Dennis Gilmore	17862cd969	increate the size of some of teh arm images. the install was too big Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-29 21:00:21 -06:00
Dennis Gilmore	454fed4a4c	install only english support on the minimal arm image Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-29 20:49:57 -06:00
Dennis Gilmore	6da9e16e53	make sure we do not include the rawhide repo Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-29 14:31:30 -06:00
Dennis Gilmore	e8de8a9ce3	make sure that all the livecds and arm images have glibc-all-langpacks installed Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-29 14:21:30 -06:00
Dennis Gilmore	5d3551ec4c	remove file that does not belong in the repo Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-25 17:14:02 -06:00
Dennis Gilmore	777c11480e	make the arm base / 3070 LXDE was too big and this keeps the image under 4GiB Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-25 16:29:47 -06:00