don't install rc.local -- let users create their own

Makefile

@@ -91,6 +91,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

script/1.in

@@ -8,4 +8,4 @@ run_sysinit
 
 install -m100 /dev/null @RUNDIR@/stopit
 
-msg_ok "Initialization complete"
+status "Initialization complete"

script/2.in

@@ -10,7 +10,13 @@ for arg in $(cat /proc/cmdline); do
     fi
 done
 
-[ -x @RCDIR@/rc.local ] && @RCDIR@/rc.local
+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
 runsvchdir "${runlevel}"
 
 ln -s @RUNSVDIR@/current @SERVICEDIR@

script/3.in

@@ -4,12 +4,20 @@ PATH=/usr/bin:/usr/sbin
 
 . @RCLIBDIR@/functions
 
-msg "Stopping services"
+stat_busy "Stop services ..."
 sv force-stop @RUNDIR@/service/*
-msg "Exiting services"
+stat_done
+stat_busy "Exit services ..."
 sv exit @RUNDIR@/service/*
+stat_done
 
-[ -x @RCDIR@/rc.shutdown ] && @RCDIR@/rc.shutdown
+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
 
 if [ -e @RUNDIR@/reboot ]; then
     chmod 100 @RUNDIR@/reboot
@@ -21,4 +29,4 @@ if [ -e @RUNDIR@/reboot ]; then
     [[ -x $(type -P kexec) ]] && kexec -e &>/dev/null
 fi
 
-msg_ok "Stage 3 completed."
+status "Stage 3 completed."

script/rc.local.in

@@ -1,4 +1,4 @@
-# @RCDIR@/rc.local -- rc.local for Artix Linux
+# @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.shutdown.in

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

sv/artix-oneshot-rc/README

@@ -1,3 +0,0 @@
-This service is a one-time script to make sure enabled one-shot/rc
-services in Artix can be run automatically on boot. For list of enabled
-rc services, run "service list rc".

sv/artix-oneshot-rc/finish

@@ -1,3 +0,0 @@
-#!/bin/sh
-. /usr/lib/rc/functions
-stop_oneshot_services

sv/artix-oneshot-rc/run

@@ -1,4 +0,0 @@
-#!/bin/sh
-. /usr/lib/rc/functions
-run_oneshot_services
-exec chpst -b artix-oneshot pause