udevd: add rm control to prevent hanging

/run/runit/{stopit,reboot} should have their perms set to 100 by
ctrlaltdel, before runit signals itself with SIGCONT, in order to
trigger a reboot. This script can be changed by a user to perform
different actions. The comments in it explain what each file is for.

Patch created for Void, imported to Artix.

Makefile

@@ -26,7 +26,9 @@ STAGES = \
 	script/3 \
 	script/ctrlaltdel
 
-RCLOCAL = script/rc.local
+RCLOCAL = script/rc.local.start script/rc.shutdown.stop
+
+UDEV = $(wildcard sv/udevd/*)
 
 AGETTY_CONSOLE = $(wildcard sv/agetty-console/*)
 AGETTY_CONSOLE_S = supervise.agetty-console
@@ -91,6 +93,7 @@ EDIT = sed \
 	-e "s|@SERVICEDIR[@]|$(SERVICEDIR)|g" \
 	-e "s|@RUNSVDIR[@]|$(RUNSVDIR)|g" \
 	-e "s|@RUNDIR[@]|$(RUNDIR)|g" \
+	-e "s|@SYSCONFDIR[@]|$(SYSCONFDIR)|g" \
 	-e "s|@RCLIBDIR[@]|$(RCLIBDIR)|g"
 
 %: %.in Makefile
@@ -117,8 +120,8 @@ install-runit:
 	$(LN) $(RUNDIR)/reboot $(DESTDIR)$(RUNITDIR)/
 	$(LN) $(RUNDIR)/stopit $(DESTDIR)$(RUNITDIR)/
 
-	install -d $(DESTDIR)$(RCDIR)
-	install -m755 $(RCLOCAL) $(DESTDIR)$(RCDIR)
+	install -d $(DESTDIR)$(SYSCONFDIR)/local.d
+	install -m755 $(RCLOCAL) $(DESTDIR)$(SYSCONFDIR)/local.d
 
 	install -d $(DESTDIR)$(BINDIR)
 	install -m755 $(BIN) $(DESTDIR)$(BINDIR)
@@ -126,6 +129,9 @@ install-runit:
 	install -d $(DESTDIR)$(TMPFILESDIR)
 	install -m755 $(TMPFILES) $(DESTDIR)$(TMPFILESDIR)/runit.conf
 
+	install -d $(DESTDIR)$(SVDIR)/udevd
+	install -Dm755 $(UDEV) $(DESTDIR)$(SVDIR)/udevd
+
 	install -d $(DESTDIR)$(SVDIR)/agetty-console
 	install -Dm755 $(AGETTY_CONSOLE) $(DESTDIR)$(SVDIR)/agetty-console
 	$(LN) $(RUNDIR)/$(AGETTY_CONSOLE_S) $(DESTDIR)$(SVDIR)/agetty-console/supervise
@@ -176,6 +182,7 @@ install-runit:
 	install -Dm755 $(AGETTY_SULOGIN) $(DESTDIR)$(SVDIR)/sulogin
 	$(LN) $(RUNDIR)/$(AGETTY_SULOGIN_S) $(DESTDIR)$(SVDIR)/sulogin/supervise
 
+	$(LN) $(SVDIR)/udevd $(DESTDIR)$(RUNSVDIR)/default/udevd
 	for g in $(AGETTY_SYMS); do $(LN) $(SVDIR)/$$g $(DESTDIR)$(RUNSVDIR)/default/$$g; done
 	for g in $(SULOGIN_SYM); do $(LN) $(SVDIR)/$$g $(DESTDIR)$(RUNSVDIR)/single/$$g; done
 

script/1.in

@@ -6,6 +6,7 @@ PATH=/usr/bin:/usr/sbin
 
 run_sysinit
 
-install -m100 /dev/null @RUNDIR@/stopit
+install -m000 /dev/null @RUNDIR@/stopit
+install -m000 /dev/null @RUNDIR@/reboot
 
 status "Initialization complete"

script/2.in

@@ -10,7 +10,11 @@ for arg in $(cat /proc/cmdline); do
     fi
 done
 
-[ -x @RCDIR@/rc.local ] && @RCDIR@/rc.local
+# Hacky hacky OpenRC compatibility
+for script in @SYSCONFDIR@/local.d/*.start; do
+    [ -x "$script" ] && "$script"
+done
+
 runsvchdir "${runlevel}"
 
 ln -s @RUNSVDIR@/current @SERVICEDIR@

script/3.in

@@ -4,14 +4,17 @@ PATH=/usr/bin:/usr/sbin
 
 . @RCLIBDIR@/functions
 
-stat_busy "Stop services ..." sv force-stop @RUNDIR@/service/*
+stat_busy "Stop services ..."
+sv force-stop @RUNDIR@/service/*
 stat_done
-stat_busy "Exit services ..." sv exit @RUNDIR@/service/*
+stat_busy "Exit services ..."
+sv exit @RUNDIR@/service/*
 stat_done
 
-if [ -e @RUNDIR@/reboot ]; then
-    chmod 100 @RUNDIR@/reboot
-fi
+# Hacky hacky OpenRC compatibility
+for script in @SYSCONFDIR@/local.d/*.stop; do
+    [ -x "$script" ] && "$script"
+done
 
 run_shutdown
 

script/ctrlaltdel.in

@@ -3,8 +3,11 @@
 PATH=/usr/bin:/usr/sbin
 MSG="System is going down..."
 
+# We check for this file after receiving a SIGCONT to move to stage3
+chmod 100 @RUNDIR@/stopit
+
 # We check for this file in stage3 to halt or reboot
-touch @RUNDIR@/reboot
+chmod 100 @RUNDIR@/reboot
 
 # Proceed with shutdown process
 echo "$MSG" | wall

script/rc.local.in

@@ -1,4 +0,0 @@
-# @RCDIR@/rc.local -- rc.local for Artix Linux
-#
-# Enter your custom commands here. It will be executed on stage 2
-# before running services.

script/rc.local.start.in

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ ! -x @SYSCONFDIR@/rc.local ]; then
+    cat > @SYSCONFDIR@/rc.local << EOF
+# @SYSCONFDIR@/rc.local -- rc.local for Artix Linux
+#
+# Enter your custom commands here. It will be executed on stage 2
+# before running services.
+EOF
+    chmod +x @SYSCONFDIR@/rc.local
+fi
+
+# Execute rc.local only once.
+# If artix-branding-base exists, that one will execute rc.local instead.
+[ ! -x @SYSCONFDIR@/local.d/local.start ] && . @SYSCONFDIR@/rc.local

script/rc.shutdown.stop.in

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ ! -x @SYSCONFDIR@/rc.shutdown ]; then
+    cat > @SYSCONFDIR@/rc.shutdown << EOF
+# @SYSCONFDIR@/rc.shutdown -- rc.shutdown for Artix Linux
+#
+# Enter your custom commands here. It will be executed on stage 3
+# after stopping services.
+EOF
+    chmod +x @SYSCONFDIR@/rc.shutdown
+fi
+
+. @SYSCONFDIR@/rc.shutdown

sv/udevd/finish

@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -S /run/udev/control ] && rm -f /run/udev/control

sv/udevd/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+udevadm control --exit
+exec udevd