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

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

README

@@ -1,23 +0,0 @@
-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

README.md

@@ -0,0 +1,31 @@
+# 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

fedora-arm-base.ks

@@ -25,8 +25,9 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
 @dial-up
 
 kernel
-
 dracut-config-generic
+# install tools needed to manage and boot arm systems
+@arm-tools
 
 chrony
 extlinux-bootloader
@@ -38,8 +39,6 @@ initial-setup-gui
 # remove this in %post
 dracut-config-generic
 
-# install uboot images
-uboot-images-armv7
 
 # make sure all the locales are available for inital0-setup and anaconda to work
 glibc-all-langpacks

fedora-arm-kde.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks
 
-part / --size=5000 --fstype ext4
+part / --size=5632 --fstype ext4
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-arm-minimal.ks

@@ -11,6 +11,8 @@ part / --size=1279 --fstype ext4
 -generic-release*
 -glibc-all-langpacks
 glibc-langpack-en
+iw
+NetworkManager-wifi
 %end
 
 %post

fedora-atomic-vagrant.ks

@@ -1,7 +1,7 @@
 # Like the Atomic cloud image, but tuned for vagrant.  Enable
 # the vagrant user, disable cloud-init.
 
-%include fedora-cloud-atomic.ks
+%include fedora-atomic.ks
 
 services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 

fedora-atomic.ks

@@ -33,7 +33,7 @@ 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=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
 
 reboot
 

fedora-cinnamon-packages.ks

@@ -18,8 +18,12 @@ hexchat
 transmission
 parole
 
-# unlock default keyring. FIXME: Should probably be done in comps
-gnome-keyring-pam
+# make sure we have a graphical installer
+yumex-dnf
+
+# extra backgrounds
+desktop-backgrounds-basic
+f24-backgrounds-extras-gnome
 
 # save some space
 -fedora-icon-theme

fedora-cloud-base-arm.ks

@@ -0,0 +1,12 @@
+%include fedora-cloud-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyAMA0,115200n8"
+
+part /boot --fstype="ext4" --size=500
+part /boot/efi --fstype="vfat" --size=100
+
+%packages
+efibootmgr
+grub2-efi
+shim
+%end

fedora-cloud-base-ppc.ks

@@ -0,0 +1,10 @@
+%include fedora-cloud-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+part prepboot --fstype="prepboot" --size=4
+part /boot --fstype="ext4" --size=500
+
+%packages
+grub2
+%end

fedora-cloud-base-vagrant.ks

@@ -19,7 +19,7 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux
 
 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between
@@ -32,6 +32,9 @@ 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

@@ -43,7 +43,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
 
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4 --grow
+part / --fstype ext4 --grow
 
 %include fedora-repo.ks
 
@@ -61,6 +61,11 @@ 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

fedora-docker-base-arm.ks

@@ -0,0 +1,6 @@
+%include fedora-docker-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+part /boot --fstype="ext4" --size=500
+part /boot/efi --fstype="vfat" --size=100

fedora-docker-base-ppc.ks

@@ -0,0 +1,5 @@
+%include fedora-docker-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+part prepboot --fstype="prepboot" --size=4

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 / --size 3000 --fstype ext4
+part / --fstype ext4 --grow
 network --bootproto=dhcp --device=link --activate --onboot=on
 reboot
 
@@ -43,6 +43,9 @@ 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
 
@@ -68,6 +71,7 @@ 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
@@ -76,13 +80,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
+
 rm -f /etc/machine-id
 
 %end

fedora-kde-packages.ks

@@ -1,4 +1,5 @@
 %packages
+@firefox
 @kde-apps
 @kde-desktop
 @kde-media
@@ -9,7 +10,7 @@
 ### The KDE-Desktop
 
 ### Browser
-firefox
+qupzilla
 
 ### fixes
 

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 12288
+part / --size 14500
 
 %packages
 
@@ -44,43 +44,16 @@ indi-gphoto
 indi-sx
 indistarter
 kstars
-skychart
-skychart-data-dso
-skychart-data-stars
 stellarium
 
 # misc. astronomy
 celestia
-xvarstar
+virtualplanet
 
 # Some astro environment stuff
-astronomy-bookmarks
 astronomy-menus
 astronomy-menus-toplevel
 
-#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-astroML-addons
-python2-astroquery
-python2-ccdproc
-python2-gatspy
-python-photutils
-python-sep
-pyephem
-APLpy
-ATpy
-
-
 #python 3 and tools/libraries not included from the groups
 python3
 python3-tools
@@ -106,9 +79,6 @@ python3-photutils
 python3-sep
 
 # matplotlib backends
-python-matplotlib-qt4
-python-matplotlib-qt5
-python-matplotlib-tk
 python3-matplotlib-qt4
 python3-matplotlib-qt5
 python3-matplotlib-tk
@@ -116,8 +86,6 @@ python3-matplotlib-tk
 
 # Python IDE very useful for scientific use
 python3-spyder
-spyder
-
 
 #Version control- a GUI for each as well
 
@@ -125,18 +93,13 @@ spyder
 rapidsvn 
 git
 git-gui
-# Mercurial
-mercurial
-mercurial-hgk
 
 #Drawing, Picture viewing tools, Visualization tools
 dia
 gimp
-inkscape
-# Disabled temp. due to dependency issue with gsl 2.1
-#kst
-#kst-docs
-#kst-fits
+kst
+kst-docs
+kst-fits
 LabPlot
 
 #Misc. Utils
@@ -147,6 +110,7 @@ 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-*

fedora-live-base.ks

@@ -55,8 +55,6 @@ aajohan-comfortaa-fonts
 
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
-dracut-config-generic
--dracut-config-rescue
 grub2-efi
 syslinux
 
@@ -74,7 +72,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
+# X-Start-Before: display-manager chronyd
 ### END INIT INFO
 
 . /etc/init.d/functions
@@ -319,6 +317,10 @@ rm -f /var/lib/systemd/random-seed
 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*
+
 %end
 
 

fedora-live-design_suite.ks

@@ -10,22 +10,54 @@
 %include fedora-live-workstation.ks
 
 # Size partition
-part / --size 10240
+part / --size 14336
 
 %packages
 # Switch to groups for design suite
 @design-suite
 
+# Added addons to address rhbz#1336879 from dnf
+gimp-data-extras
+gimp-dbp
+gimp-dds
+gimp-elsamuko
+gimp-fourier-plugin
+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-resynthesizer
+gimp-save-for-web
+gimp-separate+
+gimp-wavelet-denoise-plugin
+gimpfx-foundry
+gmic-gimp
+inkscape-psd
+inkscape-sozi
+LuxRender-blender
+sane-backends-drivers-scanners
+xsane-gimp
+#YafaRay-blender
+
 # Preview Gnome Photos
 gnome-photos
 
+# Add gthumb for renaming group files
+gthumb
+
 # Extra wallpapers
 f23-backgrounds-extras-base
 f23-backgrounds-extras-gnome
+f24-backgrounds-extras-base
+f24-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes
--gthumb
 -eog
 -rdesktop
 
@@ -35,7 +67,7 @@ f23-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', 'gnome-photos.desktop', 'gimp.desktop', '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', 'darktable.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

fedora-live-games.ks

@@ -60,7 +60,7 @@ netpanzer
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
-supertux
+# supertux # Crashing
 #supertuxkart #remove for size
 ultimatestunts
 warzone2100
@@ -98,7 +98,7 @@ openlierox
 pachi
 pioneers
 quarry
-Ri-li
+# Ri-li cut for size
 rogue
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures

fedora-live-xfce.ks

@@ -30,7 +30,7 @@ mkdir -p /home/liveuser/.config/xfce4
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
 FileManager=Thunar
-WebBrowser=midori
+WebBrowser=firefox
 FOE
 
 # disable screensaver locking (#674410)

fedora-mate-packages.ks

@@ -7,27 +7,25 @@ compiz-plugins-main
 compiz-plugins-extra
 compiz-manager
 compizconfig-python
-compiz-plugins-unsupported
-compiz-mate
+compiz-plugins-experimental
 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
 mate-disk-usage-analyzer
-mate-netspeed
 
 # more backgrounds
-f23-backgrounds-base
-f23-backgrounds-mate
-f23-backgrounds-extras-base
+f24-backgrounds-base
+f24-backgrounds-mate
+f24-backgrounds-extras-base
 
 # system tools
 system-config-printer
@@ -48,6 +46,10 @@ PackageKit-gstreamer-plugin
 # dsl tools
 rp-pppoe
 
+# some tools
+p7zip
+p7zip-plugins
+
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns

fedora-repo-not-rawhide.ks

@@ -1,3 +1,4 @@
 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

fedora-repo-rawhide.ks

@@ -1 +1,2 @@
 repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch

fedora-soas-packages.ks

@@ -32,6 +32,7 @@
 -abrt-cli
 -ibus*
 -hyperv-daemons
+-webkitgtk4-plugin-process-gtk2
 
 # Add some extra fonts
 dejavu-sans-fonts
@@ -76,9 +77,6 @@ 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

fedora-workstation-packages.ks

@@ -11,6 +11,7 @@
 @core
 @firefox
 @fonts
+@gnome-desktop
 @guest-desktop-agents
 @hardware-support
 @libreoffice

fedora-xfce-packages.ks

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

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 -a $f ${INSTALL_ROOT}${f}.kickstart
+  test -f $f && cp $f /mnt/sysimage/$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/mash/branched/$basearch/os/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \
          $PK_PREFIX/etc/yum.repos.d/fedora.repo
 fi
 if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then
@@ -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/mash/rawhide/$basearch/os/|' \
+  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \
          $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo
 fi
 rpm --root=$PK_PREFIX --initdb