fix missing /run/lock in docker base image BZ#1343138

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>

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 'http://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"
 

fedora-arm-base.ks

@@ -7,7 +7,7 @@ firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux
 
-part /boot --size=300 --fstype ext3
+part /boot --size=512 --fstype ext4
 part swap --size=512 --fstype swap
 part / --size=3000 --fstype ext4
 

fedora-arm-minimal.ks

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

fedora-cloud-atomic-pxetolive.ks

@@ -17,7 +17,7 @@ shutdown
 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
 

fedora-cloud-atomic-vagrant.ks

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

fedora-cloud-atomic.ks

@@ -33,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=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/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/rawhide/'
+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
@@ -122,5 +122,8 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
+echo "Adding Developer Mode GRUB2 menu item."
+/usr/libexec/atomic-devmode/bootentry add
+
 %end
 

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

fedora-cloud-base.ks

@@ -36,7 +36,7 @@ user --name=none
 
 firewall --disabled
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -52,7 +52,12 @@ reboot
 # Package list.
 # FIXME: instLangs does not work, so there's a hack below
 # (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
-%packages --instLangs=en
+# FIXME: instLangs bug has been fixed but now having instLangs
+# with an arg causes no langs to get installed because of BZ1262040
+# which yields the errors in BZ1261249. For now fix by not using
+# --instLangs at all
+#%packages --instLangs=en
+%packages
 
 kernel-core
 @^cloud-server-environment
@@ -62,13 +67,16 @@ kernel-core
 
 # Some things from @core we can do without in a minimal install
 -biosdevname
--plymouth
+# Need to also add back plymouth in order to mask failure of
+# systemd-vconsole-setup.service. BZ#1272684. Comment out for now
+#-plymouth
 -NetworkManager
 -iprutils
--kbd
+# Now that BZ#1199868 is fixed kbd really gets removed but it breaks
+# systemd-vconsole-setup.service on boot. Comment out for now
+#-kbd
 -uboot-tools
 -kernel
--grub2
 
 %end
 
@@ -105,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"
@@ -117,8 +122,9 @@ echo .
 
 # this is installed by default but we don't need it in virt
 # Commenting out the following for #1234504
-#echo "Removing linux-firmware package."
+# rpm works just fine for removing this, no idea why dnf can't cope
-#dnf -C -y erase linux-firmware
+echo "Removing linux-firmware package."
+rpm -e linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is pulled in
 # in install/image building.
@@ -225,21 +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
@@ -247,5 +244,8 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
+# For trac ticket https://fedorahosted.org/cloud/ticket/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
+
 %end
 

fedora-cloud-bigdata.ks

@@ -108,8 +108,10 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
 # this is installed by default but we don't need it in virt
+# Commenting out the following for #1234504
+# rpm works just fine for removing this, no idea why dnf can't cope
 echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
+rpm -e linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.

fedora-cloud-experimental.ks

@@ -99,8 +99,10 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
 # this is installed by default but we don't need it in virt
+# Commenting out the following for #1234504
+# rpm works just fine for removing this, no idea why dnf can't cope
 echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
+rpm -e linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.

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
 #
 
@@ -35,6 +35,7 @@ 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
 
@@ -75,6 +76,10 @@ 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
+
 rm -f /etc/machine-id
 
 %end

fedora-install-cloud.ks

@@ -16,12 +16,12 @@
 # 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 --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
+#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 --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
+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)

fedora-install-server.ks

@@ -16,12 +16,12 @@
 # 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 --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
+#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 --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
+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)
@@ -71,6 +71,7 @@ dracut-*
 @standard
 @core
 @hardware-support
+@networkmanager-submodules
 
 # Fedora Server.
 # Including this causes the fedora-release-server package to be included,
@@ -91,7 +92,6 @@ dracut-*
 # Web Server environment
 @haproxy
 @mongodb
-@perl-web
 @python-web
 @php
 @rubyonrails
@@ -107,7 +107,7 @@ dracut-*
 @network-server
 @printing
 @smb-server
-@virtualization
+@virtualization-headless
 @load-balancer
 @ha
 

fedora-install-workstation.ks

@@ -16,12 +16,12 @@
 # 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 --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
+#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 --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
+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
 

fedora-kde-packages.ks

@@ -8,6 +8,9 @@
 
 ### The KDE-Desktop
 
+### Browser
+firefox
+
 ### fixes
 
 # use kde-print-manager instead of system-config-printer

fedora-live-astronomy_kde.ks

@@ -0,0 +1,164 @@
+#fedora-live-astronomy-kde.ks
+# With KDE Desktop
+
+# Fedora Astronomy: For astronomers and astrophysicists
+# Fedora-Astronomy aims to create a Fedora which has the generic
+# toolset for the astronomer
+#
+# Web: https://fedoraproject.org/wiki/SIGs/Astronomy/AstroSpin
+#
+# Partly based on Scientific KDE Spin 
+#     https://fedoraproject.org/wiki/Scientific_Spin
+#
+
+# Maintainer: Christian Dersch <lupinix@fedoraproject.org>
+#             https://fedoraproject.org/wiki/User:Lupinix
+
+%include fedora-live-kde.ks
+
+# The recommended part size for DVDs is too close to use for the astronomy spin
+part / --size 12288
+
+%packages
+
+# Installing the default/mandatory packages from engineering & scientific
+@engineering-and-scientific
+
+# astronomical data analysis
+cdsclient
+fpack
+gcx
+psfex
+saoimage
+scamp
+sextractor
+siril
+skyviewer
+swarp
+
+# Observatory: KStars + INDI drivers + Skychart
+indi-aagcloudwatcher
+indi-apogee
+indi-eqmod
+indi-gphoto
+indi-sx
+kstars
+skychart
+skychart-data-dso
+skychart-data-stars
+stellarium
+
+# misc. astronomy
+celestia
+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
+python3-matplotlib
+python3-scipy
+python3-numpy
+python3-ipython
+python3-ipython-console
+python3-ipython-notebook
+python3-sympy
+python3-networkx
+python3-pandas
+# Python 3 astronomy
+python3-astropy
+python3-astroML
+python3-APLpy
+python3-ATpy
+python3-photutils
+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
+spyder
+
+
+#Version control- a GUI for each as well
+
+# Installing rapidsvn will also install subversion package
+rapidsvn 
+git
+git-gui
+# Mercurial
+mercurial
+mercurial-hgk
+
+#Backup Utilities
+backintime-kde
+
+#Drawing, Picture viewing tools, Visualization tools
+dia
+gimp
+inkscape
+kst
+kst-docs
+kst-fits
+scidavis
+
+#Misc. Utils
+ImageMagick
+kate
+kate-plugins
+rlwrap
+screen
+
+# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
+-kde-l10n-*
+-calligra-l10n-*
+
+%end
+
+%post
+
+%end

fedora-live-base.ks

@@ -15,7 +15,7 @@ selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
 part / --size 4096 --fstype ext4
-services --enabled=NetworkManager --disabled=network,sshd
+services --enabled=NetworkManager,ModemManager --disabled=network,sshd
 
 %include fedora-repo.ks
 
@@ -275,6 +275,15 @@ chmod 755 /etc/rc.d/init.d/livesys-late
 # enable tmpfs for /tmp
 systemctl enable tmp.mount
 
+# As livecd-creator is still yum based, we only get yum's yumdb during the
+# image compose. Migrate this over to dnf so that dnf and PackageKit can keep
+# track where packages came from.
+if [ ! -d /var/lib/dnf ]; then
+  mkdir -p /var/lib/dnf
+  mv /var/lib/yum/yumdb /var/lib/dnf/
+  rm -rf /var/lib/yum/
+fi
+
 # make it so that we don't do writing to the overlay for things which
 # are just tmpdirs/caches
 # note https://bugzilla.redhat.com/show_bug.cgi?id=1135475

fedora-live-cinnamon.ks

@@ -22,10 +22,6 @@ PREFERRED=/usr/bin/cinnamon-session
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
-# exclude GNOME-specific menu items
-desktop-file-edit --set-key=NoDisplay --set-value=true /usr/share/applications/fedora-release-notes.webapp.desktop
-desktop-file-edit --set-key=NoDisplay --set-value=true /usr/share/applications/yelp.desktop
-
 cat >> /etc/rc.d/init.d/livesys << EOF
 
 # set up lightdm autologin

fedora-live-design_suite.ks

@@ -15,7 +15,7 @@ part / --size 8192
 %packages
 # graphics
 blender
-LuxRender-blender
+#LuxRender-blender
 YafaRay-blender
 bluefish 
 colord-extra-profiles
@@ -75,6 +75,10 @@ lato-fonts
 open-sans-fonts
 overpass-fonts
 
+# Extra wallpapers
+f23-backgrounds-extras-base
+f23-backgrounds-extras-gnome
+
 # removal of unneeded applications
 -gnome-boxes
 -gthumb
@@ -97,7 +101,7 @@ cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 Name=List of design tutorials
 GenericName=List of Tutorials for Designers
 Comment=Reference of Design Related Tutorials
-Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
 Icon=applications-graphics
 Categories=Graphics;Documentation;
@@ -110,7 +114,7 @@ cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
 Name=Design Suite Info
 GenericName=About Design Suite
 Comment=Wiki page of Design Suite
-Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite
 Type=Application
 Icon=applications-internet
 Categories=Documentation;
@@ -123,7 +127,7 @@ cat >> /usr/share/applications/fedora-design-team.desktop << FOE
 Name=Design Team Info
 GenericName=About Design Team 
 Comment=Wiki page of Design Team
-Exec=xdg-open http://fedoraproject.org/wiki/Design
+Exec=xdg-open https://fedoraproject.org/wiki/Design
 Type=Application
 Icon=applications-internet
 Categories=Documentation;
@@ -134,4 +138,3 @@ chmod a+x /usr/share/applications/fedora-design-team.desktop
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
 %end
-

fedora-live-games.ks

@@ -4,7 +4,7 @@
 # - Bruno Wolff III <bruno@wolff.to>
 # - Formerly maintained by Rahul Sundaram
 
-%include fedora-livecd-xfce.ks
+%include fedora-live-xfce.ks
 
 # The recommended part size for DVDs is too close to use for the games spin
 part / --size 10240
@@ -20,6 +20,9 @@ part / --size 10240
 # will likely put the games spin over size and it is freeze time.
 -libreoffice*
 
+# Extra screensavers isn't much help for the games spin
+-xscreensaver-extras
+
 # Allow joysticks and game pads to work
 joystick-support
 
@@ -32,13 +35,13 @@ armacycles-ad
 asc
 asc-music
 astromenace
-beneath-a-steel-sky-cd
+# beneath-a-steel-sky-cd scummvm games cut for size
 boswars
 btanks
 bzflag
 crossfire-client
 extremetuxracer
-flight-of-the-amazon-queen-cd
+# flight-of-the-amazon-queen-cd scummvm games cut for size
 freeciv
 freecol
 freedoom
@@ -62,15 +65,15 @@ supertux
 ultimatestunts
 warzone2100
 wesnoth
-worminator
+# worminator # Would pull in fluid-soundfont-lite-patches
 warmux
 xmoto
 
 # traditional (small)
 
 abe
-alex4
+# alex4 # Would pull in fluid-soundfont-lite-patches
-ballz
+# ballz # Would pull in fluid-soundfont-lite-patches
 blobwars
 bombardier
 cdogs-sdl
@@ -85,11 +88,11 @@ hedgewars
 kcheckers
 knights
 lbrickbuster2
-liquidwar
+# liquidwar # Would pull in fluid-soundfont-lite-patches
 londonlaw
 lordsawar
-lure
+# lure scummvm games cut for size
-machineball
+# machineball # Would pull in fluid-soundfont-lite-patches
 nethack
 openlierox
 pachi
@@ -97,7 +100,7 @@ pioneers
 quarry
 Ri-li
 rogue
-scorchwentbonkers
+# scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures
 solarwolf
 sopwith
@@ -109,11 +112,11 @@ xblast
 
 auriferous
 alienblaster
-duel3
+# duel3 # Would pull in fluid-soundfont-lite-patches
 lmarbles
 powermanga
-raidem
+# raidem # Would pull in fluid-soundfont-lite-patches
-raidem-music
+# raidem-music # Would pull in fluid-soundfont-lite-patches
 trackballs
 trackballs-music
 
@@ -123,7 +126,7 @@ ballbuster
 CriticalMass
 dd2
 KoboDeluxe
-lacewing
+# lacewing # Would pull in fluid-soundfont-lite-patches
 Maelstrom
 methane
 njam
@@ -132,13 +135,13 @@ shippy
 tecnoballz
 wordwarvi
 xgalaxy
-zasx
+# zasx # Would pull in fluid-soundfont-lite-patches
 
 # falling blocks games (small) 
 
 amoebax
 crack-attack
-crystal-stacker
+# crystal-stacker # Would pull in fluid-soundfont-lite-patches
 gemdropx
 gweled
 
@@ -150,7 +153,7 @@ pingus
 # puzzles (small)
 
 escape
-gbrainy
+# gbrainy Removed for space - only game that pulls in mono
 magicor
 mirrormagic
 pipenightdreams

fedora-live-jam_kde.ks

@@ -40,6 +40,7 @@ jack-audio-connection-kit
 jack-audio-connection-kit-dbus
 qjackctl
 jackctlmmc
+ffado
 
 #pulse
 pulseaudio-module-jack

fedora-live-kde-base.ks

@@ -7,12 +7,6 @@
 
 %post
 
-# create /etc/sysconfig/desktop (needed for installation)
-cat > /etc/sysconfig/desktop <<EOF
-DESKTOP="KDE"
-DISPLAYMANAGER="KDE"
-EOF
-
 # set default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
@@ -28,17 +22,6 @@ EOF
 # add initscript
 cat >> /etc/rc.d/init.d/livesys << 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 liveuser use KDE
-echo "startkde" > /home/liveuser/.xsession
-chmod a+x /home/liveuser/.xsession
-chown liveuser:liveuser /home/liveuser/.xsession
-
 # set up autologin for user liveuser
 if [ -f /etc/sddm.conf ]; then
 sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
@@ -55,23 +38,15 @@ fi
 mkdir -p /home/liveuser/.config/
 cat > /home/liveuser/.config/kickoffrc << MENU_EOF
 [Favorites]
-FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
+FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-
+# set executable bit disable KDE security warning
-# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
 chmod +x /usr/share/applications/liveinst.desktop
-
+mkdir /home/liveuser/Desktop
-# copy over the icons for liveinst to hicolor
+cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
-cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
-cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
-cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
-cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
-cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
-cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
-touch /usr/share/icons/hicolor/
 
 # Set akonadi backend
 mkdir -p /home/liveuser/.config/akonadi
@@ -83,6 +58,7 @@ AKONADI_EOF
 # Disable plasma-pk-updates
 sed -i \
     -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \
+    /usr/share/plasma/plasmoids/org.kde.plasma.pkupdates/metadata.desktop \
     /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop
 
 # Disable baloo
@@ -97,6 +73,12 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 Enabled=false
 KRES_EOF
 
+# Disable kwallet migrator
+cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
+[Migration]
+alreadyMigrated=true
+KWALLET_EOL
+
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/

fedora-live-kde.ks

@@ -11,7 +11,7 @@
 %include fedora-live-minimization.ks
 
 # DVD payload
-part / --size=4096
+part / --size=6144
 
 
 %packages

fedora-live-scientific_kde.ks

@@ -21,9 +21,9 @@ part / --size 12288
 @engineering-and-scientific
 
 # scilab
-scilab
+#scilab
-scilab-devel
+#scilab-devel
-scilab-doc
+#scilab-doc
 
 # sagemath
 # BZ #1006230 should fix this
@@ -110,8 +110,6 @@ pdfshuffler
 openmpi
 openmpi-devel
 valgrind-openmpi
-pvm
-pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
 mpi4py-openmpi

fedora-live-workstation.ks

@@ -4,6 +4,7 @@
 
 %include fedora-live-base.ks
 %include fedora-workstation-packages.ks
+%include snippets/packagekit-cached-metadata.ks
 
 part / --size 6144 
 

fedora-mate-packages.ks

@@ -1,5 +1,4 @@
 %packages
-PackageKit*                # we switched to yumex, so we don't need this
 firefox
 @mate
 compiz
@@ -15,38 +14,40 @@ 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
-f22-backgrounds-mate
+f23-backgrounds-base
-f21-backgrounds-extras-base
+f23-backgrounds-mate
-f21-backgrounds-extras-mate
+f23-backgrounds-extras-base
 
 # system tools
 system-config-printer
 system-config-printer-applet
+lightdm-gtk-greeter-settings
 
 # audio video
 parole
 exaile
 PackageKit-gstreamer-plugin
 
-# blacklist applications which breaks mate-desktop
--audacious
-
 # office
 @libreoffice
 
 # dsl tools
 rp-pppoe
 
+# 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.
 nss-mdns

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

snippets/packagekit-cached-metadata.ks

@@ -0,0 +1,53 @@
+# %post script to include initial metadata for PackageKit
+
+%post --nochroot
+# Copy over files needed for networking inside the chroot
+for f in /etc/resolv.conf /etc/hosts ; do
+  test -f $f && cp -a $f ${INSTALL_ROOT}${f}.kickstart
+done
+%end
+
+%post
+
+# Use host machine's resolv.conf and hosts files
+for f in /etc/resolv.conf /etc/hosts ; do
+  test -f $f && mv $f $f.orig
+  test -f $f.kickstart && mv -f $f.kickstart $f
+done
+
+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/mash/branched/$basearch/os/|' \
+         $PK_PREFIX/etc/yum.repos.d/fedora.repo
+fi
+if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then
+  cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \
+         $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo
+fi
+if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then
+  cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \
+         $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo
+fi
+if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then
+  cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/$basearch/os/|' \
+         $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo
+fi
+rpm --root=$PK_PREFIX --initdb
+DESTDIR=$PK_PREFIX /usr/libexec/packagekit-direct refresh
+if [ -d /var/cache/PackageKit ] ; then
+  mv $PK_PREFIX/var/cache/PackageKit/* /var/cache/PackageKit/
+fi
+rm -rf $PK_PREFIX
+
+# Restore original resolv.conf and hosts files
+for f in /etc/resolv.conf /etc/hosts ; do
+  rm -f $f
+  test -f $f.orig && mv $f.orig $f
+done
+
+%end