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

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
Mate: clean up fedora-mate-packages.ks
2025-12-09 08:30:30 +08:00 · 2016-07-22 16:05:10 -05:00 · 2016-03-12 00:30:46 +01:00 · 2016-02-19 10:41:07 -05:00 · 2015-12-10 11:10:57 -05:00 · 2015-11-12 11:22:49 -06:00
4 changed files with 18 additions and 5 deletions
--- a/fedora-cloud-atomic-vagrant.ks
+++ b/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
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -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

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

@@ -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
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -14,14 +14,12 @@ 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
Author	SHA1	Message	Date
Adam Miller	dfde534098	fix missing /run/lock in docker base image BZ#1343138 Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>	2016-07-22 16:05:10 -05:00
raveit65	e1d8fc75bc	Mate: clean up fedora-mate-packages.ks	2016-03-12 00:30:46 +01:00
Jonathan Lebon	6641de0a8b	atomic: add Developer Mode boot menu item This patch is for the spin-kickstarts repository. Call out to the `bootentry` script in the kickstart %post so that the Developer Mode option is added to the GRUB 2 menu.	2016-02-19 10:41:07 -05:00
Dusty Mabe	2878aa0060	Fix f23 vagrant atomic host not having eth0 net device name. Fixes https://fedorahosted.org/cloud/ticket/141	2015-12-10 11:10:57 -05:00
Jan Pazdziora	2d56c91c07	Add sssd-client with .so's for easy integration with SSSD container. (cherry picked from commit `ee22a9c00c`)	2015-11-12 11:22:49 -06:00