Update Makefile

- Move back non-sysv packages in /usr/bin
- Split off sysv-compatible binaries into 'install_sysv'

1

@@ -5,20 +5,15 @@ PATH=/usr/bin:/usr/sbin
 
 . /etc/runit/functions
 
-if [ -x /usr/bin/openrc ]; then
-  msg "Welcome to Artix Linux!"
-
-  # Start core services: we'll use OpenRC for this.
-  msg "Initializing services with OpenRC..."
-  
-  for runlevel in sysinit boot default; do
-       openrc $runlevel || msg_error "Failed to start $runlevel runlevel"
-  done
-else
-  msg "Welcome to Artix Linux!"
-
 [ -r /etc/runit/rc.conf ] && . /etc/runit/rc.conf
 
+msg "Welcome to Artix Linux!"
+
+if [ -x /usr/bin/openrc ] && [ "$SVMANAGER" = "openrc" ]; then
+  # Start core services: we'll use OpenRC for this.
+  msg "Initializing runlevel sysinit with OpenRC..."
+  openrc sysinit || msg_error "Failed to start sysinit runlevel"
+else
   # Start core services: one-time system tasks.
   detect_virt
   for f in /etc/runit/core-services/*.sh; do

2

@@ -13,6 +13,13 @@ done
 
 [ -x /etc/runit/rc.local ] && /etc/runit/rc.local
 
+# The reason that boot is not in stage 1 is because if something hangs
+# we can still listen for signals, however stage 1 does NOT accept signals
+if [ -x /usr/bin/openrc ] && [ "$SVMANAGER" = "openrc" ]; then
+    openrc boot
+    openrc default
+fi
+
 runsvchdir "${runlevel}"
 mkdir -p /run/runit/runsvdir
 ln -s /etc/runit/runsvdir/current /run/runit/service

3

@@ -11,49 +11,10 @@ if [ -e /run/runit/reboot ]; then
     chmod 100 /run/runit/reboot
 fi
 
-echo
-msg "Waiting for services to stop..."
-sv force-stop /run/runit/service/*
-sv exit /run/runit/service/*
-
 [ -x /etc/runit/rc.shutdown ] && /etc/runit/rc.shutdown
 
-msg "Saving random seed..."
-( umask 077; bytes=$(cat /proc/sys/kernel/random/poolsize) || bytes=512; dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=$bytes >/dev/null 2>&1 )
+for f in /etc/runit/shutdown-services/*.sh; do
+    [ -r $f ] && . $f
+done
 
-if [ -z "$VIRTUALIZATION" -a -n "$HARDWARECLOCK" ]; then
-    hwclock --systohc ${HARDWARECLOCK:+--$(echo $HARDWARECLOCK |tr A-Z a-z)}
-fi
-
-halt -w  # for utmp
-
-if [ -z "$VIRTUALIZATION" ]; then
-    msg "Stopping udev..."
-    udevadm control --exit
-fi
-
-msg "Sending TERM signal to processes..."
-pkill --inverse -s0,1 -TERM
-sleep 1
-msg "Sending KILL signal to processes..."
-pkill --inverse -s0,1 -KILL
-
-if [ -z "$VIRTUALIZATION" ]; then
-    msg "Unmounting filesystems, disabling swap..."
-    swapoff -a
-    umount -r -a -t nosysfs,noproc,nodevtmpfs,notmpfs
-    msg "Remounting rootfs read-only..."
-    mount -o remount,ro /
-fi
-
-sync
-
-if [ -z "$VIRTUALIZATION" ]; then
-    deactivate_vgs
-    deactivate_crypt
-    if [ -e /run/runit/reboot ] && command -v kexec >/dev/null; then
-        msg "Triggering kexec..."
-        kexec -e 2>/dev/null
-        # not reached when kexec was successful.
-    fi
-fi
+msg "Stage 3 completed."

Makefile

@@ -7,26 +7,25 @@ all:
 
 install:
 	install -d ${DESTDIR}${PREFIX}/bin
-	install -m755 halt ${DESTDIR}${PREFIX}/bin/halt-runit
-	install -m755 pause ${DESTDIR}${PREFIX}/bin/pause-runit
-	install -m755 shutdown ${DESTDIR}${PREFIX}/bin/shutdown-runit
+	install -d ${DESTDIR}${PREFIX}/lib/runit-artix/bin
+	install -m755 pause ${DESTDIR}${PREFIX}/bin/pause
 	install -m755 modules-load ${DESTDIR}${PREFIX}/bin/modules-load
-	install -m755 zzz ${DESTDIR}${PREFIX}/bin/zzz-runit
-	ln -sf halt-runit ${DESTDIR}${PREFIX}/bin/poweroff-runit
-	ln -sf halt-runit ${DESTDIR}${PREFIX}/bin/reboot-runit
+	install -m755 zzz ${DESTDIR}${PREFIX}/bin/zzz
+	install -m755 halt ${DESTDIR}${PREFIX}/lib/runit-artix/bin/halt
+	install -m755 shutdown ${DESTDIR}${PREFIX}/lib/runit-artix/bin/shutdown
+	ln -sf halt ${DESTDIR}${PREFIX}/lib/runit-artix/bin/poweroff
+	ln -sf halt ${DESTDIR}${PREFIX}/lib/runit-artix/bin/reboot
 	install -d ${DESTDIR}${PREFIX}/share/man/man1
 	install -m644 pause.1 ${DESTDIR}${PREFIX}/share/man/man1
 	install -d ${DESTDIR}${PREFIX}/share/man/man8
-	install -m644 zzz.8 ${DESTDIR}${PREFIX}/share/man/man8/zzz-runit.8
-	install -m644 shutdown.8 ${DESTDIR}${PREFIX}/share/man/man8/shutdown-runit.8
-	install -m644 halt.8 ${DESTDIR}${PREFIX}/share/man/man8/halt-runit.8
+	install -m644 zzz.8 ${DESTDIR}${PREFIX}/share/man/man8/zzz.8
 	install -m644 modules-load.8 ${DESTDIR}${PREFIX}/share/man/man8
-	ln -sf halt-runit.8 ${DESTDIR}${PREFIX}/share/man/man8/poweroff-runit.8
-	ln -sf halt-runit.8 ${DESTDIR}${PREFIX}/share/man/man8/reboot-runit.8
 	install -d ${DESTDIR}/etc/runit/sv
 	install -d ${DESTDIR}/etc/runit/runsvdir
 	install -d ${DESTDIR}/etc/runit/core-services
+	install -d ${DESTDIR}/etc/runit/shutdown-services
 	install -m644 core-services/*.sh ${DESTDIR}/etc/runit/core-services
+	install -m644 shutdown-services/*.sh ${DESTDIR}/etc/runit/shutdown-services
 	install -m755 ${SCRIPTS} ${DESTDIR}/etc/runit
 	install -m644 functions $(DESTDIR)/etc/runit
 	install -m644 crypt.awk  ${DESTDIR}/etc/runit
@@ -35,10 +34,22 @@ install:
 	install -m755 rc.shutdown ${DESTDIR}/etc/runit
 	ln -sf /run/runit/reboot ${DESTDIR}/etc/runit/
 	ln -sf /run/runit/stopit ${DESTDIR}/etc/runit/
-	cp -aP runsvdir/* ${DESTDIR}/etc/runit/runsvdir/
-	cp -aP services/* ${DESTDIR}/etc/runit/sv/
+	cp -R --no-dereference --preserve=mode,links -v runsvdir/* ${DESTDIR}/etc/runit/runsvdir/
+	cp -R --no-dereference --preserve=mode,links -v services/* ${DESTDIR}/etc/runit/sv/
+
+install_sysv:
+	install -d ${DESTDIR}${PREFIX}/bin
+	ln -sf runit-init ${DESTDIR}${PREFIX}/bin/init
+	ln -sf ${PREFIX}/lib/runit-artix/bin/halt ${DESTDIR}${PREFIX}/bin/halt
+	ln -sf ${PREFIX}/lib/runit-artix/bin/shutdown ${DESTDIR}${PREFIX}/bin/shutdown
+	ln -sf halt ${DESTDIR}${PREFIX}/bin/poweroff
+	ln -sf halt ${DESTDIR}${PREFIX}/bin/reboot
+	install -m644 shutdown.8 ${DESTDIR}${PREFIX}/share/man/man8/shutdown.8
+	install -m644 halt.8 ${DESTDIR}${PREFIX}/share/man/man8/halt.8
+	ln -sf halt.8 ${DESTDIR}${PREFIX}/share/man/man8/poweroff.8
+	ln -sf halt.8 ${DESTDIR}${PREFIX}/share/man/man8/reboot.8
 
 clean:
 	-rm -f halt pause
 
-.PHONY: all install clean
+.PHONY: all install install_sysv clean

README.md

@@ -4,21 +4,24 @@ This repository contains the runit init scripts for the Artix Linux
 distribution.
 
 This work is based on Void Linux's
-[runit-void](https://github.com/voidlinux/void-runit). Patches to Void
+[void-runit](https://github.com/voidlinux/void-runit). Patches to Void
 Linux's repo will also be applied here.
 
 ## Dependencies
 
+- GNU coreutils
 - A POSIX shell
 - A POSIX awk
 - procps-ng (needs pkill -s0,1)
 - runit
+- opentmpfiles
+- opensysusers
 
 ### How to use it
 
 To see enabled services for "current" runlevel:
 
-    $ ls -l /var/service
+    $ ls -l /run/runit/service
 
 To see available runlevels (default and single, which just runs sulogin):
 
@@ -26,21 +29,21 @@ To see available runlevels (default and single, which just runs sulogin):
 
 To enable and start a service into the "current" runlevel:
 
-    # ln -s /etc/runit/sv/<service> /var/service
+    # ln -s /etc/runit/sv/<service> /run/runit/service
 
 To disable and remove a service:
 
-    # rm -f /var/service/<service>
+    # rm -f /run/runit/service/<service>
 
 To view status of all services for "current" runlevel:
 
-    # sv status /var/service/*
+    # sv status /run/runit/service/*
 
 Feel free to send patches and contribute with improvements!
 
 ## Copyright
 
-runit-cromnix is in the public domain.
+runit-artix is in the public domain.
 
 To the extent possible under law, the creator of this work has waived
 all copyright and related or neighboring rights to this work.

core-services/01-static-devnodes.sh

@@ -2,5 +2,5 @@
 # Load them by looking at the output of `kmod static-nodes`.
 
 for f in $(kmod static-nodes 2>/dev/null|awk '/Module/ {print $2}'); do
-	modprobe -q $f 2>/dev/null
+	modprobe -bq $f 2>/dev/null
 done

core-services/02-udev.sh

@@ -10,6 +10,11 @@ else
     msg_warn "cannot find udevd!"
 fi
 
+if [ -x /usr/bin/tmpfiles ]; then
+    msg "Setting up tmpfiles.d entries for /dev..."
+    tmpfiles --prefix=/dev --create --boot
+fi
+
 if [ -n "${_udevd}" ]; then
     msg "Starting udev and waiting for devices to settle..."
     ${_udevd} --daemon

core-services/05-misc.sh

@@ -19,3 +19,13 @@ if [ -n "$TIMEZONE" ]; then
     msg "Setting up timezone to '${TIMEZONE}'..."
     ln -sf "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime
 fi
+
+msg "Setting up sysusers.d entries..."
+if [ -x /usr/bin/sysusers ]; then
+    sysusers
+fi
+
+msg "Setting up tmpfiles.d entries..."
+if [ -x /usr/bin/tmpfiles ]; then
+    tmpfiles --exclude-prefix=/dev --create --remove --boot
+fi

core-services/08-sysctl.sh

@@ -3,10 +3,10 @@
 if [ -x /sbin/sysctl -o -x /bin/sysctl ]; then
     msg "Loading sysctl(8) settings..."
     for i in /run/sysctl.d/*.conf \
-        /etc/sysctl.d/*.conf \
         /usr/local/lib/sysctl.d/*.conf \
         /usr/lib/sysctl.d/*.conf \
-        /etc/sysctl.conf; do
+        /etc/sysctl.conf \
+        /etc/sysctl.d/*.conf; do
 
         if [ -e "$i" ]; then
             printf '* Applying %s ...\n' "$i"

core-services/99-cleanup.sh

@@ -7,5 +7,6 @@ fi
 if [ ! -e /var/log/btmp ]; then
 	install -m0600 -o root -g utmp /dev/null /var/log/btmp
 fi
-install -dm1777 /tmp/.X11-unix /tmp/.ICE-unix
+rm -rf /tmp
+install -dm1777 /tmp /tmp/.X11-unix /tmp/.ICE-unix
 rm -f /etc/nologin /forcefsck /forcequotacheck /fastboot

rc.conf

@@ -1,5 +1,8 @@
 # /etc/runit/rc.conf - system configuration
 
+# Set the service manager (available options: "runit" or "openrc")
+#SVMANAGER="runit"
+
 # Set the host name.
 #
 # NOTE: it's preferred to declare the hostname in /etc/hostname instead:

shutdown-services/00-stop-services.sh

@@ -0,0 +1,3 @@
+msg "Waiting for services to stop..."
+sv force-stop /run/runit/service/*
+sv exit /run/runit/service/*

shutdown-services/01-random-seed.sh

@@ -0,0 +1,2 @@
+msg "Saving random seed..."
+( umask 077; bytes=$(cat /proc/sys/kernel/random/poolsize) || bytes=512; dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=$bytes >/dev/null 2>&1 )

shutdown-services/02-hwclock.sh

@@ -0,0 +1,6 @@
+if [ -z "$VIRTUALIZATION" ] && [ -n "$HARDWARECLOCK" ]; then
+    msg "Saving hardware clock..."
+        hwclock --systohc ${HARDWARECLOCK:+--$(echo $HARDWARECLOCK |tr A-Z a-z)}
+fi
+
+halt -w # for utmp

shutdown-services/03-stop-udev.sh

@@ -0,0 +1,4 @@
+if [ -z "$VIRTUALIZATION" ]; then
+    msg "Stopping udev..."
+    udevadm control --exit
+fi

shutdown-services/04-killall.sh

@@ -0,0 +1,5 @@
+msg "Sending TERM signal to processes..."
+pkill --inverse -s0,1 -TERM
+sleep 1
+msg "Sending KILL signal to processes..."
+pkill --inverse -s0,1 -KILL

shutdown-services/97-mount-ro.sh

@@ -0,0 +1,8 @@
+if [ -z "$VIRTUALIZATION" ]; then
+    msg "Unmounting filesystems, disabling swap..."
+    swapoff -a
+    umount -r -a -t nosysfs,noproc,nodevtmpfs,notmpfs
+    msg "Remounting rootfs read-only..."
+    mount -o remount,ro /
+fi
+sync

shutdown-services/98-deactivate-crypt.sh

@@ -0,0 +1,9 @@
+if [ -z "$VIRTUALIZATION" ]; then
+    deactivate_vgs
+    deactivate_crypt
+    if [ -e /run/runit/reboot ] && command -v kexec >/dev/null; then
+        msg "Triggering kexec..."
+        kexec -e 2>/dev/null
+        # not reached when kexec was successful.
+    fi
+fi