kde: added mediawriter as a replacement for liveusb-creator

This prevents systemd to update it during boot if DHCP supplies a
hostname, which causes sddm to not start. See
https://bugzilla.redhat.com/show_bug.cgi?id=1370222

fedora-aos.ks

@@ -9,7 +9,6 @@ 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
@@ -95,5 +94,9 @@ generic-logos
 #
 %post
 
+# Enable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network on
+
 %end
 

fedora-arm-base.ks

@@ -7,14 +7,15 @@ firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux
 
-part /boot --size=512 --fstype ext4
+part /boot/fw --size=30 --fstype vfat --asprimary
-part swap --size=512 --fstype swap
+part /boot --size=512 --fstype ext4 --asprimary
-part / --size=3584 --fstype ext4
+part swap --size=512 --fstype swap --asprimary
+part / --size=3584 --fstype ext4 --asprimary
 
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 
-services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup --disabled=network
+services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
 
 %include fedora-repo.ks
 
@@ -28,9 +29,10 @@ kernel
 dracut-config-generic
 # install tools needed to manage and boot arm systems
 @arm-tools
-
+rng-tools
 chrony
 extlinux-bootloader
+bcm283x-firmware
 initial-setup
 initial-setup-gui
 #lets resize / on first boot
@@ -39,13 +41,26 @@ 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
+
+# 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)
@@ -66,5 +81,13 @@ 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
 

fedora-arm-kde.ks

@@ -5,8 +5,5 @@
 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

fedora-arm-lxde.ks

@@ -3,8 +3,5 @@
 %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

fedora-arm-mate.ks

@@ -5,8 +5,5 @@
 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

fedora-arm-minimal.ks

@@ -1,6 +1,5 @@
 %include fedora-arm-base.ks
 
-part /boot --size=512 --fstype ext4
 part swap --size=256 --fstype swap
 part / --size=1279 --fstype ext4
 

fedora-arm-soas.ks

@@ -3,8 +3,5 @@
 %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

fedora-arm-workstation.ks

@@ -10,3 +10,8 @@ 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

fedora-arm-xbase.ks

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

fedora-arm-xfce.ks

@@ -5,8 +5,5 @@
 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

fedora-atomic.ks

@@ -18,11 +18,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 net.ifnames=0"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --disabled=network
+services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
-services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -33,14 +32,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/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/25/ --ref=fedora-atomic/25/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/rawhide/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/25/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -122,8 +121,15 @@ 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
 

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,network
+services --disabled=docker-storage-setup
 services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
  
 ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
@@ -28,4 +28,9 @@ 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

fedora-cloud-base-vagrant.ks

@@ -32,9 +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 fuse-sshfs so that the vagrant-sshfs plugin won't have to
-# install it on boot. https://github.com/dustymabe/vagrant-sshfs
-fuse-sshfs
 %end
 
 %post --erroronfail

fedora-cloud-base.ks

@@ -39,11 +39,17 @@ firewall --disabled
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
-part / --fstype ext4 --grow
+#
+# 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"
 
 %include fedora-repo.ks
 
@@ -247,7 +253,6 @@ rm -f /var/lib/rpm/__db*
 # <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
@@ -265,5 +270,13 @@ 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
 

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=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -219,5 +219,9 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
+# Enable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network on
+
 %end
 

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=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -211,5 +211,9 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
+# Enable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network on
+
 %end
 

fedora-docker-base.ks

@@ -87,6 +87,8 @@ systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connec
 umount /run
 systemd-tmpfiles --create --boot
 
+# Remove machine-id on pre generated images
 rm -f /etc/machine-id
+touch /etc/machine-id
 
 %end

fedora-live-astronomy_kde.ks

@@ -66,16 +66,27 @@ 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

fedora-live-base.ks

@@ -17,7 +17,7 @@ xconfig --startxonboot
 zerombr
 clearpart --all
 part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=network,sshd
+services --enabled=NetworkManager,ModemManager --disabled=sshd
 network --bootproto=dhcp --device=link --activate
 shutdown
 
@@ -214,7 +214,9 @@ touch /.liveimg-configured
 
 # add static hostname to work around xauth bug
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
-echo "localhost" > /etc/hostname
+# the hostname must be something else than 'localhost'
+# https://bugzilla.redhat.com/show_bug.cgi?id=1370222
+echo "localhost-live" > /etc/hostname
 
 EOF
 
@@ -321,6 +323,14 @@ 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
 
 
@@ -332,4 +342,5 @@ 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

fedora-live-design_suite.ks

@@ -19,7 +19,7 @@ part / --size 14336
 # Added addons to address rhbz#1336879 from dnf
 gimp-data-extras
 gimp-dbp
-gimp-dds
+gimp-dds-plugin
 gimp-elsamuko
 gimp-fourier-plugin
 gimp-gap

fedora-live-games.ks

@@ -51,8 +51,8 @@ gl-117
 glob2
 lincity-ng
 tmw
-maniadrive
+#maniadrive - maniadrive isn't building with php7
-maniadrive-music
+#maniadrive-music
 megaglest
 nethack-vultures
 netpanzer

fedora-live-jam_kde.ks

@@ -108,7 +108,6 @@ ladspa-vco-plugins
 #lv2 plugins
 lv2
 lv2-avw-plugins
-lv2-fil-plugins
 lv2-invada-plugins
 lv2-kn0ck0ut
 lv2-ll-plugins

fedora-live-kde.ks

@@ -30,7 +30,7 @@ part / --size=6144
 k3b				# ~15 megs
 #kdeartwork			# only include some parts of kdeartwork
 fuse
-liveusb-creator
+mediawriter
 
 # only include kdegames-minimal
 -kdegames

fedora-live-scientific_kde.ks

@@ -133,9 +133,9 @@ backintime-kde
 libotf
 
 #root
-root
+#root
-root-gui-fitpanel
+#root-gui-fitpanel
-root-python
+#root-python
 
 #Multiple jobs/clustering system
 # torque

fedora-live-workstation.ks

@@ -4,7 +4,11 @@
 
 %include fedora-live-base.ks
 %include fedora-workstation-packages.ks
-%include snippets/packagekit-cached-metadata.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
 
 part / --size 6656
 

fedora-mate-packages.ks

@@ -23,8 +23,8 @@ caja-actions
 mate-disk-usage-analyzer
 
 # more backgrounds
-f24-backgrounds-base
+f25-backgrounds-base
-f24-backgrounds-mate
+f25-backgrounds-mate
 f24-backgrounds-extras-base
 
 # system tools

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