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

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
Merge #34 design-suite: remove yafaray as it is retired
2025-12-10 17:10:31 +08:00 · 2016-07-22 15:26:49 -05:00 · 2016-07-21 16:50:43 +00:00 · 2016-07-21 09:38:56 -07:00 · 2016-06-19 13:03:44 -05:00 · 2016-06-19 13:01:40 -05:00
4 changed files with 12 additions and 8 deletions
--- 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
 #

@@ -83,6 +83,10 @@ rm -f /tmp/ks-script*
 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service

+# Fix /run/lock breakage since it's not tmpfs in docker
+umount /run
+systemd-tmpfiles --create --boot
+
 rm -f /etc/machine-id

 %end
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -72,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
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -42,7 +42,7 @@ inkscape-sozi
 LuxRender-blender
 sane-backends-drivers-scanners
 xsane-gimp
-YafaRay-blender
+#YafaRay-blender

 # Preview Gnome Photos
 gnome-photos
--- a/fedora-live-games.ks
+++ b/fedora-live-games.ks
@@ -45,7 +45,7 @@ extremetuxracer
 freeciv
 freecol
 freedoom
-# freedroidrpg cut for size
+freedroidrpg
 frozen-bubble
 gl-117
 glob2
@@ -60,13 +60,13 @@ netpanzer
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
-supertux
+# supertux # Crashing
 #supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
 # worminator # Would pull in fluid-soundfont-lite-patches
-# warmux - Cut for size
+warmux
 xmoto

 # traditional (small)
Author	SHA1	Message	Date
Adam Miller	96a6711bb7	fix missing /run/lock in docker base image BZ#1343138 Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>	2016-07-22 15:26:49 -05:00
Kevin Fenzi	63bc5b44b7	Merge #34 `design-suite: remove yafaray as it is retired`	2016-07-21 16:50:43 +00:00
Luya Tshimbalanga	2df0cd5d0e	design-suite: remove yafaray as it is retired	2016-07-21 09:38:56 -07:00
Bruno Wolff III	ee5d72bae9	We probably have room for freedroid again	2016-06-19 13:03:44 -05:00
Bruno Wolff III	b0471f609a	We should have room for warmux again	2016-06-19 13:01:40 -05:00
Bruno Wolff III	7eb869a8ac	Remove Supertux 2 since it crashes	2016-06-19 13:01:40 -05:00
Bruno Wolff III	b39ac77024	Make sure chronyd runs with the correct config We need to have chronyd start after livesys has finished so that the config for chronyd gets rewritten before it starts. If not it will overwrite the system clock with a time that will be incorrect (US eastern stored as local time instead of UTC) for most people. This fixes bug 1018162.	2016-06-18 08:14:35 -05:00