Use a faster command

Since network services are started on stage 2, I'm going to delete this.
A replacement runit service will be added in the future.

Makefile

@@ -28,7 +28,6 @@ RCSVD = \
 	sv.d/misc \
 	sv.d/mount-all \
 	sv.d/net-lo \
-	sv.d/netfs \
 	sv.d/random-seed \
 	sv.d/remount-root \
 	sv.d/swap \

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"

script/rc.conf.in

@@ -26,3 +26,7 @@
 # /sys/fs/cgroup in hybrid or legacy mode
 
 # HAVE_CONTROLLER1_GROUPS="true"
+
+# Set to 'yes' to remove all files from /tmp
+
+# CLEANTMP="no"

sv.d/cleanup.in

@@ -13,6 +13,7 @@ cleaning(){
     fi
 
     rm -f /etc/nologin /forcefsck /forcequotacheck /fastboot
+    [ "$CLEANTMP" == "yes" ] && find /tmp -maxdepth 1 -name '[!ajlq\.]*' -exec rm -rf -- {} +
 }
 
 case "$1" in

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/misc.in

@@ -13,7 +13,7 @@ fsck_all() {
         IGNORE_MOUNTED="-M"
     fi
 
-    fsck -A -T -C${FSCK_FD} -a -t no${NETFS//,/,no},noopts=_netdev ${IGNORE_MOUNTED} -- ${FORCEFSCK}
+    fsck -A -T -M -C${FSCK_FD} -a -t no${NETFS//,/,no},noopts=_netdev ${IGNORE_MOUNTED} -- ${FORCEFSCK}
 }
 
 # Single-user login and/or automatic reboot after fsck (if needed)

sv.d/netfs.in

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# sourcing our current rc.conf requires this to be a bash script
-. @RCLIBDIR@/functions
-
-case "$1" in
-    start)
-        stat_busy "Mounting network filesystems"
-        mount -a -t "$NETFS"
-        rc=$?
-        mount -a -O _netdev
-        (( rc || $? )) && stat_die
-        add_daemon netfs
-        stat_done
-        ;;
-    stop)
-        stat_busy "Unmounting network filesystems"
-        umount -a -f -O _netdev
-        rc=$?
-        umount -a -f -t "$NETFS"
-        (( rc || $? )) && stat_die
-        rm_daemon netfs
-        stat_done
-        ;;
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-        exit 1
-        ;;
-esac

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"