runit-artix: move rc.local and rc.shutdown to sysconfdir

2/3: remove all deprecated files and add new OpenRC compatibility
3: actually run rc.shutdown instead of rc.local, oops
2020-08-25 08:02:23 +07:00 · 2020-08-25 08:00:11 +07:00 · 2020-08-25 07:58:05 +07:00 · 2020-08-03 23:01:04 +07:00 · 2020-08-03 23:00:29 +07:00 · 2020-08-03 22:59:27 +07:00
10 changed files with 29 additions and 25 deletions
--- a/5
+++ b/5
@@ -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
@@ -117,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)
+	install -m755 $(RCLOCAL) $(DESTDIR)$(SYSCONFDIR)

 	install -d $(DESTDIR)$(BINDIR)
 	install -m755 $(BIN) $(DESTDIR)$(BINDIR)
--- a/script/1.in
+++ b/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

-msg_ok "Initialization complete"
+status "Initialization complete"
--- a/script/2.in
+++ b/script/2.in
@@ -10,7 +10,13 @@ for arg in $(cat /proc/cmdline); do
    fi
 done

-[ -x @RCDIR@/rc.local ] && @RCDIR@/rc.local
+[ -x @SYSCONFDIR@/rc.local ] && @SYSCONFDIR@/rc.local
+
+# OpenRC compatibility
+for script in /etc/local.d/*.start; do
+    [ -x "$script" ] && "$script"
+done
+
 runsvchdir "${runlevel}"

 ln -s @RUNSVDIR@/current @SERVICEDIR@
--- a/script/3.in
+++ b/script/3.in
@@ -4,16 +4,19 @@ 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
+# OpenRC compatibility
+for script in /etc/local.d/*.stop; do
+    [ -x "$script" ] && "$script"
+done

-if [ -e @RUNDIR@/reboot ]; then
-    chmod 100 @RUNDIR@/reboot
-fi
+[ -x @SYSCONFDIR@/rc.shutdown ] && @SYSCONFDIR@/rc.shutdown

 run_shutdown

@@ -21,4 +24,4 @@ if [ -e @RUNDIR@/reboot ]; then
    [[ -x $(type -P kexec) ]] && kexec -e &>/dev/null
 fi

-msg_ok "Stage 3 completed."
+status "Stage 3 completed."
--- a/script/ctrlaltdel.in
+++ b/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
--- a/script/rc.local.in
+++ b/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.
--- a/script/rc.shutdown.in
+++ b/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.
--- a/sv/artix-oneshot-rc/README
+++ b/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".
--- a/sv/artix-oneshot-rc/finish
+++ b/sv/artix-oneshot-rc/finish
@@ -1,3 +0,0 @@
-#!/bin/sh
-. /usr/lib/rc/functions
-stop_oneshot_services
--- a/sv/artix-oneshot-rc/run
+++ b/sv/artix-oneshot-rc/run
@@ -1,4 +0,0 @@
-#!/bin/sh
-. /usr/lib/rc/functions
-run_oneshot_services
-exec chpst -b artix-oneshot pause
Author	SHA1	Message	Date
Muhammad Herdiansyah	397b46ff3f	runit-artix: move rc.local and rc.shutdown to sysconfdir	2020-08-25 08:02:23 +07:00
Muhammad Herdiansyah	ee63bf4a06	2/3: remove all deprecated files and add new OpenRC compatibility	2020-08-25 08:00:11 +07:00
Muhammad Herdiansyah	bcd456603b	3: actually run rc.shutdown instead of rc.local, oops	2020-08-25 07:58:05 +07:00
Érico Rolim	c75de34303	ctrlaltdel: trigger a reboot properly. /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.	2020-08-03 23:01:04 +07:00
Érico Rolim	6453301c3b	3: remove /run/runit/reboot handling. runit uses the permissions in the /etc/runit/reboot file to determine whether it's going to perform a halt or reboot action. This conditional in 3 meant that touching the reboot file, even with 000 perms, would lead to a reboot, which goes agains what is expected according to the runit documentation. Patch made for Void, imported to Artix.	2020-08-03 23:00:29 +07:00
Érico Rolim	454078d6a0	1: only create /run/runit directory. The 100 permission in /run/runit/stopit made it so that signaling runit with SIGCONT would shut the system down. To achieve the correct behavior, we should create the stopit and reboot files with 000 perms, and allow their permissions to be set correctly by calls to `init 0` or `init 6` or by /etc/runit/ctrlaltdel. Patch created for Void, imported to Artix.	2020-08-03 22:59:27 +07:00
Muhammad Herdiansyah	05801e2283	don't install rc.local -- let users create their own	2020-01-08 15:58:01 +07:00
Muhammad Herdiansyah	f84f50c4e9	fix deprecation message	2020-01-01 09:49:40 +07:00
Muhammad Herdiansyah	10bdc1aa58	better message	2020-01-01 09:41:28 +07:00
Muhammad Herdiansyah	2b66059dbf	Move any local files from /etc/rc/rc.local to /etc/rc.local	2019-12-30 22:35:25 +07:00