packagekit-cached-metadata.ks: Set up resolv.conf and hosts files

Copy over host system's /etc/resolv.conf and /etc/hosts to make it possible to resolve kojipkgs.fedoraproject.org inside the chroot.
packagekit-cached-metadata.ks: Use http for kojipkgs.fedoraproject.org
2025-12-09 00:20:31 +08:00 · 2015-10-20 20:24:09 +02:00 · 2015-10-20 20:19:19 +02:00 · 2015-10-20 20:17:29 +02:00 · 2015-10-20 11:13:25 -05:00 · 2015-10-20 08:42:43 -05:00
67 changed files with 940 additions and 492 deletions
--- a/.sparkleshare
+++ b/.sparkleshare
@@ -0,0 +1 @@
+d6afc629dc9311ebd79b4cedb2775531065ecb05
--- a/2
+++ b/2
@@ -18,8 +18,6 @@ install:
 	install -m 644 custom/* $(DATADIR)/$(name)/custom
 	mkdir -p -m 755 $(DATADIR)/$(name)/l10n
 	install -m 644 l10n/* $(DATADIR)/$(name)/l10n
-	mkdir -p -m 755 $(DATADIR)/$(name)/snippets
-	install -m 644 snippets/* $(DATADIR)/$(name)/snippets

 clean:
 	rm -f $(name)-*.tar.gz
--- 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
@@ -4,5 +4,5 @@
 <%page args="ostree_osname, ostree_ref"/>
 append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
 append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
+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 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'\n%end\n"

--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@@ -9,6 +9,7 @@ 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
@@ -94,9 +95,5 @@ generic-logos
 #
 %post

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

--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -7,15 +7,14 @@ firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux

-part /boot/fw --size=30 --fstype vfat --asprimary
-part /boot --size=512 --fstype ext4 --asprimary
-part swap --size=512 --fstype swap --asprimary
-part / --size=3584 --fstype ext4 --asprimary
+part /boot --size=300 --fstype ext3
+part swap --size=512 --fstype swap
+part / --size=3000 --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 --disabled=network

 %include fedora-repo.ks

@@ -26,13 +25,12 @@ services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setu
@dial-up

 kernel
+
 dracut-config-generic
-# install tools needed to manage and boot arm systems
-@arm-tools
-rng-tools
+
 chrony
+arm-boot-config
 extlinux-bootloader
-bcm283x-firmware
 initial-setup
 initial-setup-gui
 #lets resize / on first boot
@@ -41,26 +39,13 @@ initial-setup-gui
 # remove this in %post
 dracut-config-generic

-# make sure all the locales are available for inital0-setup and anaconda to work
-glibc-all-langpacks
+# install uboot images
+uboot-images-armv7

-# workaround for consequence of RHBZ #1324623: without this, with
-# yum-based creation tools, compose fails due to conflict between
-# libcrypt and libcrypt-nss. dnf does not seem to have the same
-# issue, so this may be dropped when appliance-creator is ported
-# to dnf.
-libcrypt-nss
-libcrypt
 %end

 %post

-# Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
-sed -i '/vfat/ d' /etc/fstab
-
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
@@ -71,23 +56,14 @@ rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*

-# remove random seed, the newly installed instance should make it's own
-rm -f /var/lib/systemd/random-seed
-
 # Because memory is scarce resource in most arm systems we are differing from the Fedora
 # default of having /tmp on tmpfs.
 echo "Disabling tmpfs for /tmp."
 systemctl mask tmp.mount

-dnf -y remove dracut-config-generic
+/usr/sbin/a-b-c

-# 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
+yum -y remove dracut-config-generic

 %end

--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -2,8 +2,11 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks

-part / --size=5632 --fstype ext4
+part / --size=5000 --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
@@ -3,5 +3,8 @@
 %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-mate.ks
+++ b/fedora-arm-mate.ks
@@ -2,8 +2,11 @@
 %include fedora-arm-xbase.ks
 %include fedora-mate-packages.ks

-part / --size=5500 --fstype ext4
+part / --size=5000 --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,17 +1,13 @@
 %include fedora-arm-base.ks

 part swap --size=256 --fstype swap
-part / --size=1279 --fstype ext4
+part / --size=1200 --fstype ext4

 %packages
 -@standard
 -@dial-up
 -initial-setup-gui
 -generic-release*
-glibc-all-langpacks
-glibc-langpack-en
-iw
-NetworkManager-wifi
 %end

 %post
@@ -22,5 +18,9 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .

+echo -n "Enabling initial-setup text mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
+echo .
+
 %end

--- a/fedora-arm-server.ks
+++ b/fedora-arm-server.ks
@@ -23,5 +23,9 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .

+echo -n "Enabling initial-setup text mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
+echo .
+
 %end

--- a/fedora-arm-soas.ks
+++ b/fedora-arm-soas.ks
@@ -2,104 +2,9 @@
 %include fedora-arm-xbase.ks
 %include fedora-soas-packages.ks

-firewall --enabled --service=mdns,presence
-
 %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 .

-# 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
-# set Sugar as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=sugar/' /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
-
-# disable screensaver locking
-cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
-[org.gnome.desktop.screensaver]
-lock-enabled=false
-FOE
-
-# and hide the lock screen option
-cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
-[org.gnome.desktop.lockdown]
-disable-lock-screen=true
-FOE
-
-# rebuild schema cache with any overrides we installed
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
 %end
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-workstation-packages.ks

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

 %packages
 -initial-setup
@@ -10,8 +10,3 @@ part / --size=5500 --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
@@ -5,5 +5,8 @@
 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-cinnamon-packages.ks
+++ b/fedora-cinnamon-packages.ks
@@ -18,12 +18,8 @@ hexchat
 transmission
 parole

-# make sure we have a graphical installer
-yumex-dnf
-
-# extra backgrounds
-desktop-backgrounds-basic
-f24-backgrounds-extras-gnome
+# unlock default keyring. FIXME: Should probably be done in comps
+gnome-keyring-pam

 # save some space
 -fedora-icon-theme
--- a/fedora-cloud-atomic-pxetolive.ks
+++ b/fedora-cloud-atomic-pxetolive.ks
@@ -14,10 +14,10 @@ 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
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/23/ --ref=fedora-atomic/f23/x86_64/docker-host
 
 %post

@@ -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-atomic-vagrant.ks
+++ b/fedora-cloud-atomic-vagrant.ks
@@ -1,20 +1,13 @@
 # Like the Atomic cloud image, but tuned for vagrant.  Enable
 # the vagrant user, disable cloud-init.

-%include fedora-atomic.ks
+%include fedora-cloud-atomic.ks

 services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final

 user --name=vagrant --password=vagrant
 rootpw vagrant

-# The addition of the net.ifnames=0 and biosdevnames=0 option ensures that
-# even on VirtualBox virt, we get a primary network device with "eth0" as the name
-# This simplifies things and allows a single disk image for both supported Vagrant
-# platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
-
-
 %post --erroronfail

 # Work around cloud-init being both disabled and enabled; need
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -18,10 +18,11 @@ user --name=none

 firewall --disabled

-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 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
@@ -32,14 +33,14 @@ volgroup atomicos pv.01
 logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos

 # Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/25/ --ref=fedora-atomic/25/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/23/ --ref=fedora-atomic/f23/x86_64/docker-host

 reboot

 %post --erroronfail
 # See https://github.com/projectatomic/rpm-ostree/issues/42
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/25/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'

 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -121,15 +122,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.)"

-# For trac ticket https://fedorahosted.org/cloud/ticket/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
-
-echo "Adding Developer Mode GRUB2 menu item."
-/usr/libexec/atomic-devmode/bootentry add
-
-# enable 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
@@ -1,12 +0,0 @@
-%include fedora-cloud-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyAMA0,115200n8"
-
-part /boot --fstype="ext4" --size=500
-part /boot/efi --fstype="vfat" --size=100
-
-%packages
-efibootmgr
-grub2-efi
-shim
-%end
--- a/fedora-cloud-base-ppc.ks
+++ b/fedora-cloud-base-ppc.ks
@@ -1,10 +0,0 @@
-%include fedora-cloud-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part prepboot --fstype="prepboot" --size=4
-part /boot --fstype="ext4" --size=500
-
-%packages
-grub2
-%end
--- a/fedora-cloud-base-vagrant.ks
+++ b/fedora-cloud-base-vagrant.ks
@@ -19,7 +19,7 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"

 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -36,20 +36,14 @@ user --name=none

 firewall --disabled

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

 network --bootproto=dhcp --device=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
-#
-# We need to disable 64bit options here or extlinux won't work.
-# See: http://www.syslinux.org/wiki/index.php/Filesystem#ext4
-# and
-# https://bugzilla.redhat.com/show_bug.cgi?id=1369934
-#
-part / --fstype ext4 --grow --mkfsoptions="-O ^64bit"
+part / --size 3000 --fstype ext4 --grow

 %include fedora-repo.ks

@@ -67,11 +61,6 @@ reboot

 kernel-core
@^cloud-server-environment
-# Need to pull in the udev subpackage
-systemd-udev
-
-# after move away from grub2 - let's add 'which' back
-which

 # rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
@@ -88,7 +77,6 @@ which
 #-kbd
 -uboot-tools
 -kernel
-grub2

 %end

@@ -125,9 +113,6 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf

 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
@@ -246,20 +231,12 @@ echo "-----------------------------------------------------------------------"
 rm -f /var/lib/rpm/__db*


-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda

 # FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
-chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys

 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
@@ -270,13 +247,5 @@ echo "(Don't worry -- that out-of-space error was expected.)"
 # For trac ticket https://fedorahosted.org/cloud/ticket/128
 rm -f /etc/sysconfig/network-scripts/ifcfg-ens3

-# 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
-
 %end

--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -26,7 +26,7 @@ firewall --disabled
 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
@@ -219,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
@@ -17,7 +17,7 @@ firewall --disabled
 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
@@ -211,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-docker-base-arm.ks
+++ b/fedora-docker-base-arm.ks
@@ -1,6 +0,0 @@
-%include fedora-docker-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part /boot --fstype="ext4" --size=500
-part /boot/efi --fstype="vfat" --size=100
--- a/fedora-docker-base-ppc.ks
+++ b/fedora-docker-base-ppc.ks
@@ -1,5 +0,0 @@
-%include fedora-docker-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part prepboot --fstype="prepboot" --size=4
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -1,4 +1,4 @@
-# This is a minimal Fedora install designed to serve as a Docker base image.
+# 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.
@@ -9,9 +9,9 @@
 #
 # 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
 #

@@ -24,7 +24,7 @@ user --name=none
 keyboard us
 zerombr
 clearpart --all
-part / --fstype ext4 --grow
+part / --size 3000 --fstype ext4
 network --bootproto=dhcp --device=link --activate --onboot=on
 reboot

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

@@ -43,9 +42,6 @@ sssd-client
 %end

 %post --log=/tmp/anaconda-post.log
-
-set -e
-
 # Set the language rpm nodocs transaction flag persistently in the
 # image yum.conf and rpm macros

@@ -55,23 +51,15 @@ 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

-echo "# fstab intentionally empty for containers" > /etc/fstab
 rm -f /usr/lib/locale/locale-archive

 #Setup locale properly
@@ -80,15 +68,13 @@ localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
 rm -rf /var/cache/yum/*
 rm -f /tmp/ks-script*

+#Make it easier for systemd to run in Docker container
+cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
+sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
+
 #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

-# Fix /run/lock breakage since it's not tmpfs in docker
-umount /run
-systemd-tmpfiles --create --boot
-
-# Remove machine-id on pre generated images
 rm -f /etc/machine-id
-touch /etc/machine-id

 %end
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -0,0 +1,93 @@
+# Kickstart file for composing the "Fedora Cloud" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+
+# In non-master branches the fedora repo commands should be uncommented
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+
+# Package manifest for the compose.  Uses repo group metadata to translate groups.
+# (default groups for the configured repos are added by --default)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-syslog-ng*
+-astronomy-bookmarks
+# generic* would match generic-jms-ra, so don't 'simplify' this
+-generic-logos*
+-generic-release*
+-GConf2-dbus*
+-bluez-gnome
+-community-mysql*
+# jruby used to be in this list, but springframework-context explicitly
+# requires it, not just 'any ruby implemention' - please check for things
+# on the image that require mvn(org.jruby:jruby) before adding jruby to
+# this list again - adamw 2014/09
+#-jruby
+
+# core
+kernel*
+dracut-*
+
+
+# Things needed for installation
+@anaconda-tools
+fedora-productimg-cloud
+-fedora-productimg-server
+-fedora-productimg-workstation
+
+# Packages to enable server images to run in cloud environments
+@cloud-server
+@core
+@standard
+@headless-management
+@dogtag
+@directory-server
+@dns-server
+@freeipa-server
+@ftp-server
+@guest-agents
+@ha
+@load-balancer
+@mail-server
+@mysql
+@network-server
+@smb-server
+@sql-server
+@web-server
+
+# Langpacks
+autocorr-*
+hunspell-*
+hyphen-*
+man-pages-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -0,0 +1,135 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+
+# In non-master branches the fedora repo commands should be uncommented
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+
+# Package manifest for the compose.  Uses repo group metadata to translate groups.
+# (default groups for the configured repos are added by --default)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default
+
+-fedora-productimg-cloud
+fedora-productimg-server
+-fedora-productimg-workstation
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-syslog-ng*
+-astronomy-bookmarks
+-generic-logos*
+-generic-release*
+-GConf2-dbus*
+-bluez-gnome
+-community-mysql*
+
+# core
+kernel*
+dracut-*
+
+# No desktops
+-cinnamon*
+-enlightenment*
+-gnome-shell
+-gnome-session
+-kde*
+-lightdm-kde
+-lightdm-razorqt
+# Pulls in qt
+-oprofile-gui
+
+-@legacy-fonts
+
+-@multimedia
+
+## common stuff
+@guest-agents
+@standard
+@core
+@hardware-support
+@networkmanager-submodules
+
+# Fedora Server.
+# Including this causes the fedora-release-server package to be included,
+# which in turn enables server-product-environment, and due to to its priority
+# this will be the default environment.
+@^server-product-environment
+@server-product
+@headless-management
+@container-management
+@domain-client
+@server-hardware-support
+
+# Common server packages
+@mysql
+@sql-server
+@web-server
+
+# Web Server environment
+@haproxy
+@mongodb
+@python-web
+@php
+@rubyonrails
+@tomcat
+
+# Infrastructure Server
+@directory-server
+@dogtag
+@dns-server
+@freeipa-server
+@ftp-server
+@mail-server
+@network-server
+@printing
+@smb-server
+@virtualization-headless
+@load-balancer
+@ha
+
+@javaenterprise
+
+# “uservisible” groups we want to offer
+@editors
+@network-server
+@system-tools
+@text-internet
+
+# Things needed for installation
+@anaconda-tools
+fedora-productimg-server
+
+# Langpacks
+autocorr-*
+hunspell-*
+man-pages-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -0,0 +1,51 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+
+# In non-master branches the fedora repo commands should be uncommented
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+
+%include fedora-workstation-packages.ks
+
+# Package manifest for the compose.  Uses repo group metadata to translate groups.
+# (default groups for the configured repos are added by --default)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-astronomy-bookmarks
+-generic*
+
+# core
+kernel*
+
+# Things needed for installation
+@anaconda-tools
+-fedora-productimg-cloud
+-fedora-productimg-server
+fedora-productimg-workstation
+
+%end
--- a/fedora-kde-packages.ks
+++ b/fedora-kde-packages.ks
@@ -1,5 +1,4 @@
 %packages
-@firefox
@kde-apps
@kde-desktop
@kde-media
@@ -10,7 +9,7 @@
 ### The KDE-Desktop

 ### Browser
-qupzilla
+firefox

 ### fixes

--- a/fedora-live-astronomy_kde.ks
+++ b/fedora-live-astronomy_kde.ks
@@ -17,7 +17,7 @@
 %include fedora-live-kde.ks

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

 %packages

@@ -42,18 +42,55 @@ indi-apogee
 indi-eqmod
 indi-gphoto
 indi-sx
-indistarter
 kstars
+skychart
+skychart-data-dso
+skychart-data-stars
 stellarium

 # misc. astronomy
 celestia
-virtualplanet
+xvarstar

 # Some astro environment stuff
+astronomy-bookmarks
 astronomy-menus
 astronomy-menus-toplevel

+#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
+# for astronomy
+cfitsio-devel
+CCfits-devel
+libnova-devel
+wcslib-devel
+
+
+#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 astronomy
+astropy-tools
+python-astropy
+python-astroML
+python-photutils
+python-sep
+pyephem
+APLpy
+ATpy
+
+
 #python 3 and tools/libraries not included from the groups
 python3
 python3-tools
@@ -66,37 +103,26 @@ 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

 # matplotlib backends
+python-matplotlib-qt4
+python-matplotlib-qt5
+python-matplotlib-tk
 python3-matplotlib-qt4
 python3-matplotlib-qt5
 python3-matplotlib-tk


 # Python IDE very useful for scientific use
-python3-spyder
+spyder
+

 #Version control- a GUI for each as well

@@ -104,24 +130,28 @@ python3-spyder
 rapidsvn 
 git
 git-gui
+# Mercurial
+mercurial
+mercurial-hgk
+
+#Backup Utilities
+backintime-kde

 #Drawing, Picture viewing tools, Visualization tools
 dia
 gimp
+inkscape
 kst
 kst-docs
 kst-fits
-LabPlot
+scidavis

 #Misc. Utils
-# icedtea-web to have webstart useful for VO tools
-icedtea-web
 ImageMagick
 kate
 kate-plugins
 rlwrap
 screen
-plasma-applet-redshift-control

 # Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
 -kde-l10n-*
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -14,12 +14,8 @@ auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
-zerombr
-clearpart --all
-part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=sshd
-network --bootproto=dhcp --device=link --activate
-shutdown
+part / --size 4096 --fstype ext4
+services --enabled=NetworkManager,ModemManager --disabled=network,sshd

 %include fedora-repo.ks

@@ -38,8 +34,6 @@ shutdown
 # Explicitly specified here:
 # <notting> walters: because otherwise dependency loops cause yum issues.
 kernel
-kernel-modules
-kernel-modules-extra

 # This was added a while ago, I think it falls into the category of
 # "Diagnosis/recovery tool useful from a Live OS image".  Leaving this untouched
@@ -55,11 +49,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
-glibc-all-langpacks
 %end

 %post
@@ -72,7 +62,7 @@ cat > /etc/rc.d/init.d/livesys << EOF
 # chkconfig: 345 00 99
 # description: Init script for live image.
 ### BEGIN INIT INFO
-# X-Start-Before: display-manager chronyd
+# X-Start-Before: display-manager
 ### END INIT INFO

 . /etc/init.d/functions
@@ -214,9 +204,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

@@ -292,6 +280,7 @@ systemctl enable tmp.mount
 # note https://bugzilla.redhat.com/show_bug.cgi?id=1135475
 cat >> /etc/fstab << EOF
 vartmp   /var/tmp    tmpfs   defaults   0  0
+varcacheyum /var/cache/yum  tmpfs   mode=0755,context=system_u:object_r:rpm_var_cache_t:s0   0   0
 EOF

 # work around for poor key import UI in PackageKit
@@ -307,30 +296,23 @@ rm -f /var/lib/rpm/__db*
 # go ahead and pre-make the man -k cache (#455968)
 /usr/bin/mandb

+# save a little bit of space at least...
+rm -f /boot/initramfs*
 # make sure there aren't core files lying around
 rm -f /core*

-# remove random seed, the newly installed instance should make it's own
-rm -f /var/lib/systemd/random-seed
-
 # convince readahead not to collect
 # FIXME: for systemd

+# forcibly regenerate fontconfig cache (so long as this live image has
+# fontconfig) - see #1169979
+if [ -x /usr/bin/fc-cache ] ; then
+   fc-cache -f
+fi
+
 echo 'File created by kickstart. See systemd-update-done.service(8).' \
    | tee /etc/.updated >/var/.updated

-# Drop the rescue kernel and initramfs, we don't need them on the live media itself.
-# 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


@@ -342,5 +324,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-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -1,65 +1,89 @@
 # 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

-# Size partition
-part / --size 14336
+#DVD size partition
+part / --size 8192

 %packages
-# Switch to groups for design suite
-@design-suite
-
-# Added addons to address rhbz#1336879 from dnf
-gimp-data-extras
-gimp-dbp
-gimp-dds-plugin
+# graphics
+blender
+#LuxRender-blender
+YafaRay-blender
+bluefish 
+colord-extra-profiles
+darktable
+dia
+entangle
+fontforge
+font-manager 
+gimp
 gimp-elsamuko
-gimp-fourier-plugin
+gimp-*-plugin
+gimp-data-extras
 gimp-gap
-gimp-help
-gimp-help-browser
-gimp-high-pass-filter
-gimp-layer-via-copy-cut
-gimp-lensfun
-gimp-lqr-plugin
-gimp-normalmap
 gimp-paint-studio
+gimp-high-pass-filter
+gimp-normalmap
 gimp-resynthesizer
-gimp-save-for-web
 gimp-separate+
-gimp-wavelet-denoise-plugin
-gimpfx-foundry
+gpick
+GraphicsMagick
 gmic-gimp
-inkscape-psd
+hugin 
+ImageMagick
+inkscape
 inkscape-sozi
 inkscape-table
-#LuxRender-blender Comment that line because i86 support is no longer available
-sane-backends-drivers-scanners
-xsane-gimp
-#YafaRay-blender
+mypaint
+nautilus-image-converter
+optipng
+phatch
+screenruler
+simple-scan
+scribus
+shutter
+synfigstudio
+xournal

-# Add extra gnome applications
-gnome-books
-gnome-calendar
-gnome-photos
+# office
+vym
+pdfmod
+pdfshuffler  
+
+# internet
+filezilla
+sparkleshare
+sshpass
+
+# audio & video
+audacity
+pitivi
+
+# fonts
+aajohan-comfortaa-fonts
+adobe-source-sans-pro-fonts
+campivisivi-titillium-fonts
+lato-fonts
+open-sans-fonts
+overpass-fonts

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

 # removal of unneeded applications
 -gnome-boxes
+-gthumb
 -eog
+-gnome-photos
 -rdesktop

 %end
@@ -68,7 +92,7 @@ f25-backgrounds-extras-gnome
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', '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
@@ -7,7 +7,7 @@
 %include fedora-live-xfce.ks

 # The recommended part size for DVDs is too close to use for the games spin
-part / --size 14336
+part / --size 10240

 %packages

@@ -35,13 +35,13 @@ armacycles-ad
 asc
 asc-music
 astromenace
-# beneath-a-steel-sky-cd scummvm games cut for size
+beneath-a-steel-sky-cd
 boswars
 btanks
 bzflag
 crossfire-client
 extremetuxracer
-# flight-of-the-amazon-queen-cd scummvm games cut for size
+flight-of-the-amazon-queen-cd
 freeciv
 freecol
 freedoom
@@ -51,16 +51,16 @@ gl-117
 glob2
 lincity-ng
 tmw
-#maniadrive - maniadrive isn't building with php7
-#maniadrive-music
+maniadrive
+maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
 #neverball #cut for size
 nogravity
-#pinball # Would pull in fluid-soundfont-lite-patches
+pinball
 scorched3d
-# supertux # Crashing
+supertux
 #supertuxkart #remove for size
 ultimatestunts
 warzone2100
@@ -91,14 +91,14 @@ lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
 londonlaw
 lordsawar
-# lure scummvm games cut for size
+lure
 # machineball # Would pull in fluid-soundfont-lite-patches
 nethack
 openlierox
 pachi
 pioneers
 quarry
-# Ri-li cut for size
+Ri-li
 rogue
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -11,7 +11,7 @@
 #             https://fedoraproject.org/wiki/User:jvlomax
 #             Brendan Jones <brendan.jones.it@gmail.com>

-%include fedora-live-kde.ks
+%include fedora-livecd-kde.ks

 # DVD size partition
 part / --size 10240 --fstype ext4
@@ -77,7 +77,7 @@ sooperlooper

 #recodring and DAW
 audacity
-ardour4
+ardour3
 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
@@ -167,6 +168,9 @@ rtirq
 japa
 radium-compressor

+#streaming
+idjc
+
 # fedora jam theming (to be customized)
 kfaenza-icon-theme
 fedora-jam-backgrounds
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -4,6 +4,7 @@

 %include fedora-live-base.ks
 %include fedora-kde-packages.ks
+%include snippets/packagekit-cached-metadata.ks

 %post

--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -19,6 +19,7 @@ part / --size=6144
 # don't include these for now to fit on a cd
 -desktop-backgrounds-basic
 -kdeaccessibility*
+-kdeartwork-screensavers	# screensavers are not needed on live images
 #-ktorrent			# kget has also basic torrent features (~3 megs)
 -digikam			# digikam has duplicate functionality with gwenview (~28 megs)
 #-amarok 			# ~23 megs (mysql-embedded etc.)
@@ -30,7 +31,7 @@ part / --size=6144
 k3b				# ~15 megs
 #kdeartwork			# only include some parts of kdeartwork
 fuse
-mediawriter
+liveusb-creator

 # only include kdegames-minimal
 -kdegames
@@ -43,7 +44,7 @@ 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
+-adobe-source-han-sans-twhk-fonts	# traditional Chinese

 -paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
 #-stix-fonts		# mathematical symbols
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -79,4 +79,7 @@ chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF

+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 %end
--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@@ -7,6 +7,7 @@
 -mpage
 -sox
 -hplip
+-hpijs
 -numactl
 -isdn4k-utils
 -autofs
--- a/fedora-live-robotics.ks
+++ b/fedora-live-robotics.ks
@@ -6,7 +6,7 @@
 %include fedora-live-minimization.ks

 # The recommended part size for DVDs is too close to use for the robotics spin
-part / --size 10752
+part / --size 10240

 %packages
 # Start with GNOME
--- a/fedora-live-scientific_kde.ks
+++ b/fedora-live-scientific_kde.ks
@@ -1,9 +1,11 @@
-# Fedora Scientific with KDE Desktop
+#fedora-livedvd-scientific-kde.ks
+# With KDE Desktop

 # 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/
+# Web: https://fedoraproject.org/wiki/Scientific_Spin
+# Web: http://spins.fedoraproject.org/scientific-kde/

 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
@@ -11,7 +13,7 @@
 %include fedora-live-kde.ks

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

 %packages

@@ -19,12 +21,14 @@ part / --size 14500
@engineering-and-scientific

 # scilab
-scilab
-scilab-devel
-scilab-doc
+#scilab
+#scilab-devel
+#scilab-doc

-# Remove sagemath explicitly?
-sagemath
+# sagemath
+# BZ #1006230 should fix this
+#sagemath
+#sagemath-notebook

 #Devel tools

@@ -84,10 +88,6 @@ rkward
 # GUI for Octave
 qtoctave

-# julia
-julia
-julia-doc
-
 # IDEs for the IDE folks
@eclipse
 spyder
@@ -133,9 +133,9 @@ backintime-kde
 libotf

 #root
-#root
-#root-gui-fitpanel
-#root-python
+root
+root-gui-fitpanel
+root-python

 #Multiple jobs/clustering system
 # torque
@@ -153,8 +153,8 @@ xzgv
 gimp
 ggobi
 ggobi-devel
-#g3data
-#Mayavi
+g3data
+Mayavi

 #Misc. Utils
 screen
@@ -173,4 +173,4 @@ firefox

 %post

-%end
+%end
--- a/fedora-live-security.ks
+++ b/fedora-live-security.ks
@@ -6,9 +6,10 @@
 # Maintainers:
 #   Fabian Affolter <fab [AT] fedoraproject <dot> org>
 #   Joerg Simon <jsimon [AT] fedoraproject <dot> org>
+#   Christoph Wickert <cwickert [AT] fedoraproject <dot> org>
 # Acknowledgements:
 #   Fedora LiveCD Xfce Spin team - some work here was and will be inherited,
-#   many thanks, especially to Christoph Wickert!
+#   many thanks!
 #   Fedora LXDE Spin - Copied over stuff to make LXDE Default
 #   Luke Macken and Adam Miller for the original OpenBox Security ks and all
 #   the Security Applications! 
@@ -93,6 +94,9 @@ gnome-keyring-pam
 %post
 # xfce configuration

+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 # create /etc/sysconfig/desktop (needed for installation)

 cat > /etc/sysconfig/desktop <<EOF
--- a/fedora-live-soas.ks
+++ b/fedora-live-soas.ks
@@ -51,7 +51,6 @@ 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
@@ -59,7 +58,6 @@ org.sugarlabs.AbacusActivity
 org.sugarlabs.IRC
 org.sugarlabs.InfoSlicer
 org.sugarlabs.PortfolioActivity
-org.sugarlabs.StoryActivity
 org.sugarlabs.VisualMatchActivity
 com.garycmartin.Moon
 mulawa.Countries
@@ -76,8 +74,6 @@ 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
-# set Sugar as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf

 # Don't use the default system user (in SoaS liveuser) as nick name
 # Disable the logout menu item in Sugar
@@ -92,6 +88,19 @@ 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
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set Sugar as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
+EOF
+
+cat >> /etc/rc.d/init.d/livesys-late << EOF

 # disable screensaver locking
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
@@ -106,7 +115,12 @@ disable-lock-screen=true
 FOE

 # rebuild schema cache with any overrides we installed
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+EOF
+
+chmod 755 /etc/rc.d/init.d/livesys-late
+/sbin/restorecon /etc/rc.d/init.d/livesys-late
+/sbin/chkconfig --add livesys-late

 %end
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -4,16 +4,15 @@

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

-part / --size 6656
+part / --size 6144 

 %post

+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 cat >> /etc/rc.d/init.d/livesys << EOF


--- a/fedora-live-xfce.ks
+++ b/fedora-live-xfce.ks
@@ -16,6 +16,9 @@
 %post
 # xfce configuration

+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 # create /etc/sysconfig/desktop (needed for installation)

 cat > /etc/sysconfig/desktop <<EOF
@@ -30,7 +33,7 @@ mkdir -p /home/liveuser/.config/xfce4
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
 FileManager=Thunar
-WebBrowser=firefox
+WebBrowser=midori
 FOE

 # disable screensaver locking (#674410)
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -1,5 +1,4 @@
 %packages
-PackageKit*                # we switched to yumex, so we don't need this
 firefox
@mate
 compiz
@@ -7,25 +6,27 @@ compiz-plugins-main
 compiz-plugins-extra
 compiz-manager
 compizconfig-python
-compiz-plugins-experimental
+compiz-plugins-unsupported
+compiz-mate
 libcompizconfig
 compiz-plugins-main
 ccsm
-simple-ccsm
 emerald-themes
 emerald
 fusion-icon
+fusion-icon-gtk
@networkmanager-submodules
 blueman

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

 # more backgrounds
-f25-backgrounds-base
-f25-backgrounds-mate
-f24-backgrounds-extras-base
+f23-backgrounds-base
+f23-backgrounds-mate
+f23-backgrounds-extras-base

 # system tools
 system-config-printer
@@ -37,18 +38,17 @@ parole
 exaile
 PackageKit-gstreamer-plugin

-# blacklist applications which breaks mate-desktop
-audacious
-
 # office
@libreoffice

 # dsl tools
 rp-pppoe

-# some tools
-p7zip
-p7zip-plugins
+# drop packages
+-PackageKit*                # we switched to yumex, so we don't need this
+
+# blacklist applications which breaks mate-desktop
+-audacious

 # 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.
--- a/fedora-repo-not-rawhide.ks
+++ b/fedora-repo-not-rawhide.ks
@@ -1,4 +1,3 @@
 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 @@
 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-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -32,8 +32,6 @@
 -abrt-cli
 -ibus*
 -hyperv-daemons
-webkitgtk4-plugin-process-gtk2
-webkitgtk3

 # Add some extra fonts
 dejavu-sans-fonts
@@ -78,6 +76,9 @@ pulseaudio-utils
 # 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
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -11,7 +11,6 @@
@core
@firefox
@fonts
-@gnome-desktop
@guest-desktop-agents
@hardware-support
@libreoffice
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -21,16 +21,10 @@

 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
-# Admin tools are handy to have
-@admin-tools
 # Add some screensavers, people seem to like them
 # Note that blank is still default.
 xscreensaver-extras
 wget
-# Handy for debugging
-rfkill
-# Better more popular browser
-firefox
 system-config-printer

 # save some space
--- a/snippets/autologin-gdm.ks
+++ b/snippets/autologin-gdm.ks
@@ -0,0 +1,12 @@
+# %post modifications for gdm
+
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+chown -R fedora:fedora /home/fedora
+sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf
+if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
+    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
+    chown fedora:fedora /home/fedora/.face
+    # TODO: would be nice to get e-d-s to pick this one up too... but how?
+fi
+EOF
+
--- a/snippets/autologin-kdm.ks
+++ b/snippets/autologin-kdm.ks
@@ -0,0 +1,33 @@
+# %post modifications for kdm and kde
+
+# add initscript
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+
+if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
+    # use image also for kdm
+    mkdir -p /usr/share/apps/kdm/faces
+    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
+fi
+
+# make fedora user use KDE
+echo "startkde" > /home/fedora/.xsession
+chmod a+x /home/fedora/.xsession
+chown fedora:fedora /home/fedora/.xsession
+
+# set up autologin for user fedora
+sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
+
+# set up user fedora as default user and preselected user
+sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
+sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
+
+# add liveinst.desktop to favorites menu
+mkdir -p /home/fedora/.kde/share/config/
+cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF
+[Favorites]
+FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
+MENU_EOF
+chown -R fedora:fedora /home/fedora/.kde/
+EOF
+
--- a/snippets/config-developer.ks
+++ b/snippets/config-developer.ks
@@ -0,0 +1,7 @@
+# %post modifications to add link to demonstration videos to desktop
+
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+pushd /home/fedora/Desktop
+ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
+popd
+EOF
--- a/snippets/config-electronic-lab.ks
+++ b/snippets/config-electronic-lab.ks
@@ -0,0 +1,57 @@
+# %post modifications specifically for Fedora Electronic Lab
+
+# Fedora Electronic Lab: Kwin buttons
+cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
+[Style]
+ButtonsOnLeft=MB
+ButtonsOnRight=FIAX
+CustomButtonPositions=true
+EOF
+
+# kill klipper
+cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
+[General]
+AutoStart=false
+EOF
+
+# use the LCD_Style clock as alliance's windows demand a lot of space on kicker
+cat > /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc <<EOF
+[Digital]
+LCD_Style=false
+Show_Date=false
+Show_Seconds=true
+
+[General]
+Type=Digital
+EOF
+
+cat > /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc <<EOF
+[Layout]
+DisplayNames=
+EnableXkbOptions=false
+IncludeGroups=
+LayoutList=us,de,fr,jp
+Model=pc104
+Options=
+ResetOldOptions=false
+ShowFlag=true
+ShowSingle=true
+StickySwitching=false
+StickySwitchingDepth=2
+SwitchMode=Global
+Use=true
+EOF
+
+# Chitlesh doesn't like the KDE icon on the kicker, but fedora's
+# This is a feature for Fedora and not for KDE
+cp -fp /usr/share/icons/Bluecurve/16x16/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/16x16/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/24x24/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/22x22/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/32x32/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/32x32/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/48x48/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/48x48/apps/kmenu.png
+
+/sbin/chkconfig anacron off
+/sbin/chkconfig sendmail off
+/sbin/chkconfig nfs off
+/sbin/chkconfig nfslock off
+/sbin/chkconfig rpcidmapd off
+/sbin/chkconfig rpcbind off
--- a/snippets/config-kde-gnome-keyring.ks
+++ b/snippets/config-kde-gnome-keyring.ks
@@ -0,0 +1,19 @@
+# %post modifications to set up gnome-keyring in KDE
+
+mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown
+cat > /etc/skel/.kde/env/start-custom.sh << EOF
+#!/bin/sh
+eval \`gnome-keyring-daemon\`
+export GNOME_KEYRING_PID
+export GNOME_KEYRING_SOCKET
+EOF
+chmod 755 /etc/skel/.kde/env/start-custom.sh
+
+cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF
+#/bin/sh
+if [-n "$GNOME_KEYRING_PID"]; then
+	kill $GNOME_KEYRING_PID
+fi
+EOF
+
+chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh
--- a/snippets/config-tracker.ks
+++ b/snippets/config-tracker.ks
@@ -0,0 +1,16 @@
+# %post modifications to configure tracker search
+
+mkdir -p /home/fedora/.config/tracker
+
+cat > /home/fedora/.config/tracker/tracker.cfg <<EOF
+[Indexing]
+EnableIndexing=false
+Language=en
+EOF
+
+mkdir -p /root/.config/tracker
+cat > /root/.config/tracker/tracker.cfg <<EOF
+[Indexing]
+EnableIndexing=false
+Language=en
+EOF
--- a/snippets/eeepc900-modifications.ks
+++ b/snippets/eeepc900-modifications.ks
@@ -0,0 +1,164 @@
+###### Eee PC 900 stuff ####################################################
+#
+###### Hotkeys #############################################################
+cat > /etc/acpi/actions/hotkeys.sh << EOHOTKEY
+#!/bin/bash
+
+export DISPLAY=:0
+
+case "$3" in
+
+    #Fn+F2
+    00000010)
+        # Wlan On
+        /etc/acpi/actions/wlan.sh poweron
+        ;;
+    00000011)
+        # Wlan Off
+        /etc/acpi/actions/wlan.sh poweroff
+        ;;
+
+    #Fn+F6
+    00000012)
+        # Webcam switch
+        /etc/acpi/actions/camera.sh
+        # TaskManager
+	# /usr/bin/gnome-system-monitor
+	;;
+
+    #Fn+F7
+    00000013)
+        # Volume mute
+	/usr/bin/amixer set -D hw:0 Master toggle
+	;;
+
+    #Fn+F8
+    00000014)
+        # Volume down
+        /usr/bin/amixer set -D hw:0 Master 10%- unmute
+        ;;
+
+    #Fn+F9
+    00000015)
+        # Volume up
+        /usr/bin/amixer set -D hw:0 Master 10%+ unmute
+        ;;
+
+    #Fn+F5
+    00000030)
+
+	/usr/bin/xrandr --output VGA  --mode 1024x768 \
+			--output LVDS --off
+
+	if [[ "$?" != "0" ]]; then
+
+	/usr/bin/xrandr --output VGA  --preferred \
+			--output LVDS --off
+
+	fi
+	;;
+
+    00000031)
+
+	/usr/bin/xrandr --output LVDS --mode 800x480 \
+		        --output VGA  --mode 800x600
+
+        ;;
+    
+    00000032)
+
+	/usr/bin/xrandr --output VGA  --off       \
+           		--output LVDS --preferred
+
+        ;;
+    *)
+        logger "ACPI hotkey $3 action is not defined"
+        ;;
+esac
+EOHOTKEY
+
+###### WLAN #############################################################
+cat > /etc/acpi/actions/wlan.sh << EOF
+#!/bin/bash
+
+PWR=$(cat /sys/devices/platform/eeepc/wlan)
+
+UnloadModules() {
+    rmmod ath_pci
+    rmmod ath_rate_sample
+    rmmod wlan_scan_sta
+    rmmod wlan_tkip
+    rmmod wlan_wep
+    rmmod wlan
+}
+
+LoadModules() {
+    modprobe ath_pci
+}
+
+case $1 in
+    poweron)
+        if [[ "$PWR" = "0" ]]; then
+            modprobe pciehp pciehp_force=1
+
+	    echo 1 > /sys/devices/platform/eeepc/wlan
+
+	    rmmod pciehp
+
+        fi
+        ;;
+           
+    poweroff)
+        if [[ "$PWR" = "1" ]]; then
+
+            modprobe pciehp pciehp_force=1
+
+            ifconfig ath0 down
+
+            wlanconfig ath0 destroy
+
+            UnloadModules
+
+            echo 0 > /sys/devices/platform/eeepc/wlan
+
+            rmmod pciehp
+
+        fi
+        ;;
+esac
+EOF
+
+###### Webcam #############################################################
+cat > /etc/acpi/actions/camera.sh << EOF
+
+#!/bin/bash
+
+CAMERA=$(cat /sys/devices/platform/eeepc/camera)
+
+        if [[ "$CAMERA" = "0" ]]; then
+   	    echo 1 > /sys/devices/platform/eeepc/camera
+         else
+            echo 0 > /sys/devices/platform/eeepc/camera
+        fi
+EOF
+
+chmod +x "/etc/acpi/actions/*"
+
+###### Shutdown fix #########################################################
+echo "modprobe -r snd-hda-intel" >> /sbin/halt.local
+chmod 755 /sbin/halt.local
+
+###### Gnome display stuff ##################################################
+
+gconftool-2 --set /apps/nautilus/preferences/desktop_font --type string "Sans 8"
+gconftool-2 --set /desktop/gnome/interface/document_font_name --type string "Sans 8"
+gconftool-2 --set /desktop/gnome/interface/font_name --type string "Sans 8"
+gconftool-2 --set /apps/metacity/general/titlebar_font --type string "Sans Bold 8"
+gconftool-2 --set /desktop/gnome/interface/monospace_font_name --type string "Monospace 8"
+gconftool-2 --set /apps/metacity/window_keybindings/toggle_fullscreen --type string "<Alt>F11"
+gconftool-2 --set /desktop/gnome/interface/toolbar_style --type string "icons"
+gconftool-2 --set /desktop/gnome/sound/default_mixer_tracks --type list --list-type string "[PCM]"
+gconftool-2 --set /apps/gnome-power-manager/notify/low_capacity --type bool 0
+gconftool-2 --set /apps/compiz/plugins/move/allscreens/options/constrain_y --type bool 0
+gconftool-2 --set /apps/panel/toplevels/top_panel_screen0/size --type integer 19
+gconftool-2 --set /apps/panel/toplevels/bottom_panel_screen0/size --type integer 19
--- a/snippets/packagekit-cached-metadata.ks
+++ b/snippets/packagekit-cached-metadata.ks
@@ -3,7 +3,7 @@
 %post --nochroot
 # Copy over files needed for networking inside the chroot
 for f in /etc/resolv.conf /etc/hosts ; do
-  test -f $f && cp $f /mnt/sysimage/$f.kickstart
+  test -f $f && cp -a $f ${INSTALL_ROOT}${f}.kickstart
 done
 %end

@@ -19,7 +19,7 @@ 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=http://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/mash/branched/$basearch/os/|' \
         $PK_PREFIX/etc/yum.repos.d/fedora.repo
 fi
 if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then
@@ -34,7 +34,7 @@ if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then
 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=http://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/mash/rawhide/$basearch/os/|' \
         $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo
 fi
 rpm --root=$PK_PREFIX --initdb
--- a/snippets/repository-debuginfo.ks
+++ b/snippets/repository-debuginfo.ks
@@ -0,0 +1,25 @@
+# %post modifications to enable debuginfo repository
+
+awk '
+BEGIN {
+  debuginfo = 0
+}
+  /^\[.*\]/ {
+  if (/debuginfo/) {
+    debuginfo = 1
+  } else {
+    debuginfo = 0
+  }
+  print
+  next
+}
+  /enabled=0/ && debuginfo {
+  print "enabled=1"
+  next
+}
+{
+  print
+  next
+}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp
+mv /etc/yum.repos.d/fedora.repo{.tmp,}
+
--- a/snippets/screensaver-gnome.ks
+++ b/snippets/screensaver-gnome.ks
@@ -0,0 +1,5 @@
+# %post modifications to disable GNOME screensaver locking
+
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
+EOF
--- a/snippets/screensaver-kde.ks
+++ b/snippets/screensaver-kde.ks
@@ -0,0 +1,3 @@
+# %post modifications to disable KDE screensaver
+
+sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc
--- a/snippets/sysconfig-kde.ks
+++ b/snippets/sysconfig-kde.ks
@@ -0,0 +1,6 @@
+# %post modifications to create /etc/sysconfig/desktop for KDE
+
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
--- a/snippets/sysconfig-xfce.ks
+++ b/snippets/sysconfig-xfce.ks
@@ -0,0 +1,5 @@
+# %post modifications to create /etc/sysconfig/desktop for XFCE
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/startxfce4
+EOF
Author	SHA1	Message	Date
Kalev Lember	0bc399cf58	packagekit-cached-metadata.ks: Set up resolv.conf and hosts files Copy over host system's /etc/resolv.conf and /etc/hosts to make it possible to resolve kojipkgs.fedoraproject.org inside the chroot.	2015-10-20 20:24:09 +02:00
Kalev Lember	b53dfb5ba8	packagekit-cached-metadata.ks: Use http for kojipkgs.fedoraproject.org It turns out that koji builders can't access kojipkgs.fedoraproject.org over https, but plain http works just fine.	2015-10-20 20:19:19 +02:00
Kalev Lember	469ad561b9	Move packagekit-cached-metadata.ks to snippets/ ... and make it a top-level script wrapped in %post ... %end.	2015-10-20 20:17:29 +02:00
Rex Dieter	f5eb0bee5f	split pk cached metadata hack into include'able snippet and add to -kde-base	2015-10-20 11:13:25 -05:00
Rex Dieter	21a379ef79	kde: Plasma session notifies for available updates See also http://bugzilla.redhat.com/1262600	2015-10-20 08:42:43 -05:00
Kalev Lember	e07cfce2f1	workstation: Include cached metadata for PackageKit Instead of taking the metadata from PackageKit-cached-metadata package as we were doing previously, copy it over directly during the compose from https://kojipkgs.fedoraproject.org/mash/ This makes it much less error prone as we always get the very latest metadata, and makes maintenance much simpler as we don't need to roll PackageKit-cached-metadata by hand. Users are also going to appreciate this because it makes post-GA updates smaller as they won't have to download updates for the PackageKit-cached-metadata subpackage each time PackageKit gets updated.	2015-10-19 20:45:58 +02:00
Luya Tshimbalanga	7e607ce0f3	Merge branch 'f23' of ssh://git.fedorahosted.org/git/spin-kickstarts into f23	2015-10-18 09:33:07 -07:00
Luya Tshimbalanga	f206dc6253	design-suite: fix typo on f23-backgrounds-extras-base	2015-10-18 09:31:46 -07:00
Matthew Miller	2585bce264	adds kbd,plymouth rpms back. We have had -kbd in the kickstart for a long time, but because of BZ#1199868 it wasn't actually getting excluded. Not having it causes systemd-vconsole-setup.service to fail so we are adding it back for now. Additionally we need to add back plymouth to cover up the subsequent failure of systemd-vconsole-setup.service. See BZ#1272684.	2015-10-17 13:00:12 -04:00
Kushal Das	72774fc6b0	Fixes trac #128 Removes extra ifcfg file.	2015-10-15 13:44:41 +05:30
Luya Tshimbalanga	aa81c7cd0e	Merge branch 'f23' of ssh://git.fedorahosted.org/git/spin-kickstarts into f23	2015-10-13 10:39:04 -07:00
Luya Tshimbalanga	5e9291ec1c	design-suite: restore luxrender and add extra wallpapers	2015-10-13 10:38:17 -07:00
Bruno Wolff III	a44b1dc6d3	Games spin: xscreensaver-extras was supposed to get removed	2015-10-13 09:52:38 -05:00
Luya Tshimbalanga	5fe8408f5c	Merge branch 'f23' of ssh://git.fedorahosted.org/git/spin-kickstarts into f23	2015-10-12 21:39:49 -07:00
Bruno Wolff III	6751aa3849	Games spin - cut to get back under 4 GiB	2015-10-12 19:31:30 -05:00
raveit65	6d5b58634a	Mate add f23-backgrounds-extras-base	2015-10-13 00:56:13 +02:00
Rex Dieter	01e4b012f3	kde: drop (deprecated) xsession stuff	2015-09-25 10:09:26 -05:00
Rex Dieter	9b16a9462d	add trailing / , to ensure we copy to dir and not as file	2015-09-25 09:49:16 -05:00
Rex Dieter	2a96952c22	kde: drop kdm reference	2015-09-25 09:20:47 -05:00
Rex Dieter	84557491c8	kde: drop reference to /etc/sysconfig/desktop deprecated long ago	2015-09-25 09:19:43 -05:00
Rex Dieter	1274fda3e7	kde: update default favorites	2015-09-25 09:18:30 -05:00
Rex Dieter	7f133a05ce	drop liveinst icon hack no longer needed, and needlessly invalidates icon cache	2015-09-25 09:14:45 -05:00
Rex Dieter	330c56ad28	explicitly mkdir Desktop dir workaround https://bugzilla.redhat.com/show_bug.cgi?id=1266243	2015-09-25 09:13:35 -05:00
Peter Robinson	7764a782a5	adjust linux-firmware for cloud images	2015-09-23 07:16:42 +01:00
Rex Dieter	0f26c21c8d	disable kwallet migrator	2015-09-21 20:16:48 -05:00
Kushal Das	4d05ed6718	Removes extlinux parameter from bootloader information.	2015-09-15 02:48:58 +05:30
Dusty Mabe	93793acd48	cloud-base: workaround issue where langs are not getting installed. Workaround BZ1262040 by removing the --instLangs arg from the %packages line and rely on our previous hack to manually remove langs after install. This fixes BZ1261249. Signed-off-by: Kushal Das <kushaldas@gmail.com>	2015-09-15 00:10:07 +05:30
Luya Tshimbalanga	27ed383622	design: use https for fpo address	2015-09-10 20:58:29 -07:00
David Ward	d86a3b5d9d	fedora-live-base.ks: enable ModemManager service The ModemManager package is already installed for all live images; it should be enabled so users can connect to WWAN right after boot using the NetworkManager applet. Signed-off-by: David Ward <david.ward@ll.mit.edu>	2015-09-07 10:36:21 -06:00
raveit65	f85ce784f9	Mate-live f23: disable caja-actions for the moment	2015-09-07 09:54:28 +02:00
Kevin Fenzi	73bf1e7ef1	Add ffado to jam spin. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1259053	2015-09-03 09:58:40 -06:00
Colin Walters	1fac51f92e	atomic: Fix references for branched	2015-09-02 17:13:48 -04:00
Colin Walters	60e8bf04f0	cloud-atomic: s/rawhide/23/ on this branch	2015-08-27 16:02:27 -04:00
Amit	2ee3dfa33d	Scientific: Comment out scilab for now.	2015-08-21 23:50:44 +10:00
Amit	6cbd02ead6	scientific: pvm is retired	2015-08-17 22:15:07 +10:00
Luya Tshimbalanga	9e4639836a	design-suite: temporarily removal of luxrender-blender due to broken dependency (rhbz #1253408 )	2015-08-13 09:27:16 -07:00
Dan Book	0790ffabbb	menu items should be excluded by cinnamon now	2015-08-12 14:37:23 -04:00
Rex Dieter	be135f9a7d	kde: +firefox per https://lists.fedoraproject.org/pipermail/kde/2015-August/015363.html	2015-08-11 13:33:08 -05:00
Stephen Gallagher	d90ed68560	Fedora Server: Include @networkmanager-submodules This is needed for optional installations including WiFI or WWAN	2015-08-10 14:24:41 -04:00
raveit65	c51b27294e	Mate: use f23 backgrounds	2015-08-07 16:33:08 +02:00
Dennis Gilmore	fb40fd6d03	do not remove grub2 Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2015-08-06 18:41:39 -05:00
Dennis Gilmore	bc1f075e41	remove the hacks in %post for extlinux Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2015-08-06 16:02:18 -05:00
Dennis Gilmore	932524c849	switch the cloud base image to grub for Alpha Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2015-08-06 14:32:36 -05:00
Stephen Gallagher	1568248565	Temporarily remove @perl-web group from the DVD This is due to package issues caused by a broken perl-MongoDB package. We will fix it post-alpha and re-add this.	2015-08-05 08:46:06 -04:00
Stephen Gallagher	8453b8352b	Pull in @virtualization-headless instead of @virtualization	2015-08-05 08:45:01 -04:00
raveit65	5a7026e059	Mate: add lightdm-gtk-greeter-settings	2015-07-30 17:27:10 +02:00
Bruno Wolff III	f0a3e2cef0	Remove games that pull in fluid-soundfont-lite-patches fluid-soundfont-lite-patches is 200MB installed and we need some big cuts to get under size again.	2015-07-26 00:46:41 -05:00
Christian Dersch	0c88d07916	Added kickstart file for Astronomy Spin	2015-07-25 20:17:25 +02:00
Bruno Wolff III	86e5787b35	The name of the XFCE ks file changed	2015-07-24 11:39:22 -05:00
Adam Williamson	75b7f9fd28	bump the KDE compose root size a bit KDE composes have been failing for weeks due to insufficient space in the compose root.	2015-07-22 08:42:40 -07:00
raveit65	2e6490e3f4	Mate: remove packagekit packages	2015-07-17 17:28:58 +02:00
Bruno Wolff III	0aafbdc2a2	f23 is no longer rawhide I changed the scripts that clearly stated where rawhide references were to be commented out, but there are some rawhide references in atomic stuff that may or may not need to be changed.	2015-07-15 19:43:04 -05:00