Check if udev is already run in stage2 by runit

Svfail

script/functions.in

@@ -156,7 +156,7 @@ in_array() {
 
 print_welcome() {
     # see os-release(5)
-    . /etc/os-release
+    . /usr/lib/os-release
 
     echo " "
     printhl "${PRETTY_NAME}\n"

sv.d/console-setup.in

@@ -6,14 +6,15 @@
 config(){
     [ -r /etc/vconsole.conf ] && . /etc/vconsole.conf
     TTYS=${TTYS:-6}
-    if [ -n "$FONT" ]; then
-        _index=0
-        while [ ${_index} -le $TTYS ]; do
+    _index=0
+    while [ ${_index} -le $TTYS ]; do
+        if [ -n "$FONT" ]; then
             setfont ${FONT_MAP:+-m $FONT_MAP} ${FONT_UNIMAP:+-u $FONT_UNIMAP} \
                     $FONT -C "/dev/tty${_index}"
-            _index=$((_index + 1))
-        done
-    fi
+        fi
+        printf "\033%s" "%G" >/dev/tty${_index}
+        _index=$((_index + 1))
+    done
     if [ -n "$KEYMAP" ]; then
         loadkeys -q -u ${KEYMAP}
     fi

sv.d/hwclock.in

@@ -13,11 +13,13 @@ esac
 
 case "$1" in
     start)
+        stat_busy "Adjusting hwclock"
         hwclock $HWCLOCK_PARAMS || stat_die
         add_daemon hwclock
         stat_done
         ;;
     stop)
+        stat_busy "Adjusting hwclock"
         hwclock --adjust $HWCLOCK_PARAMS || stat_die
         rm_daemon hwclock
         stat_done

sv.d/root.in

@@ -45,7 +45,7 @@ umount_fs() {
 
 case "$1" in
     start)
-        stat_busy "Mounting filesystema"
+        stat_busy "Mounting filesystems"
         mount_fs || stat_die root
         add_daemon root
         stat_done root

sv.d/udev.in

@@ -5,10 +5,15 @@
 
 case "$1" in
     start)
-        stat_busy "Starting udev daemon"
-        udevd --daemon || stat_die udev
-        add_daemon udev
-        stat_done udev
+        # check if runit already runs udevd
+        if ! pgrep -f "runsv udevd" >/dev/null 2>&1; then
+            stat_busy "Starting udev daemon"
+            udevd --daemon || stat_die udev
+            # Note: This is only needed for initialization, udev will
+            #       be controlled by runit on stage 2.
+            add_daemon udev
+            stat_done udev
+        fi
         ;;
     stop)
         stat_busy "Stopping udev"