+x

Makefile

@@ -26,7 +26,7 @@ STAGES = \
 	script/3 \
 	script/ctrlaltdel
 
-RCLOCAL = script/rc.local script/rc.shutdown
+RCLOCAL = script/rc.local.start script/rc.shutdown.stop
 
 AGETTY_CONSOLE = $(wildcard sv/agetty-console/*)
 AGETTY_CONSOLE_S = supervise.agetty-console
@@ -118,8 +118,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)

script/2.in

@@ -10,13 +10,11 @@ for arg in $(cat /proc/cmdline); do
     fi
 done
 
-if [ -x @RCDIR@/rc.local ] && grep -qv '^#' @RCDIR@/rc.local; then
-    @RCDIR@/rc.local
-    echo "==> @RCDIR@/rc.local has been deprecated. Please move the contents"
-    echo "    of the file to @SYSCONFDIR@/rc.local, since the next version of"
-    echo "    runit-artix won't read @RCDIR@/rc.local anymore."
-fi
-[ -x @SYSCONFDIR@/rc.local ] && @SYSCONFDIR@/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

@@ -11,13 +11,10 @@ stat_busy "Exit services ..."
 sv exit @RUNDIR@/service/*
 stat_done
 
-if [ -x @RCDIR@/rc.shutdown ] && grep -qv '^#' @RCDIR@/rc.shutdown; then
-    @RCDIR@/rc.shutdown
-    echo "==> @RCDIR@/rc.shutdown has been depreacted. Please move the contents"
-    echo "    of the file to @SYSCONFDIR@/rc.shutdown since the next version of"
-    echo "    runit-artix won't read @RCDIR@/rc.shutdown anymore."
-fi
-[ -x @SYSCONFDIR@/rc.local ] && @SYSCONFDIR@/rc.local
+# Hacky hacky OpenRC compatibility
+for script in @SYSCONFDIR@/local.d/*.stop; do
+    [ -x "$script" ] && "$script"
+done
 
 run_shutdown
 

script/rc.local.in

@@ -1,4 +0,0 @@
-# @SYSCONFDIR@/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,13 @@
+#!/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
+
+. @SYSCONFDIR@/rc.local

script/rc.shutdown.in

@@ -1,4 +0,0 @@
-# @SYSCONFDIR@/rc.shutdown -- rc.shutdown for Artix Linux
-#
-# Enter your custom commands here. It will be executed on stage 3
-# after stopping services.

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