udevd: add rm control to prevent hanging

Makefile

@@ -28,6 +28,8 @@ STAGES = \
 
 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
 
@@ -127,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
@@ -177,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/rc.local.start.in

@@ -1,10 +1,15 @@
 #!/bin/sh
 
-[ ! -x @SYSCONFDIR@/rc.local ] && cat > @SYSCONFDIR@/rc.local << EOF
+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
 
-. @SYSCONFDIR@/rc.local
+# 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

@@ -1,10 +1,13 @@
 #!/bin/sh
 
-[ ! -x @SYSCONFDIR@/rc.shutdown ] && cat > @SYSCONFDIR@/rc.shutdown << EOF
+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