From c15d3d5be4011f9bfc7e36fb1629529c1eb2e009 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 12 Oct 2017 09:03:03 +0200 Subject: Various fixes and cleanups for base upgrade systemd 234 qemu 2.10 linux 4.13 --- init | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'init') diff --git a/init b/init index 031b015..bbc0343 100755 --- a/init +++ b/init @@ -3,7 +3,7 @@ # Init script for build2 Build OS. # # Loosely based on the one that comes in Debian initrd.img (since we are -# using its kernel image as is). +# using its kernel image). # trap "exit 1" ERR set -o errtrace # Trap in functions. @@ -52,8 +52,7 @@ mount -t tmpfs -o "nodev,nosuid,size=10%,mode=1777" tmpfs /tmp # Start udev. # -# Based on Debian initrd's init-top/udev. Note that we don't stop it at -# at the end of init. +# Based on Debian initrd's init-{top,bottom}/udev # info "starting udev..." @@ -63,7 +62,8 @@ fi SYSTEMD_LOG_LEVEL=info /lib/systemd/systemd-udevd --daemon --resolve-names=never -udevadm trigger --action=add +udevadm trigger --type=subsystems --action=add +udevadm trigger --type=devices --action=add udevadm settle || true # Initialize KVM. @@ -467,6 +467,10 @@ cat </etc/systemd/system/getty@tty1.service.d/noclear.conf TTYVTDisallocate=no EOF +# Stop udev daemon (systemd will start its own). +# +udevadm control --exit + # Get rid of klibc tools. # export PATH=/sbin:/usr/sbin:/bin:/usr/bin -- cgit v1.1