Re: [PR PATCH] [Updated] runit-void: split package into main package and init controls

[heliocat <heliocat@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 3204 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages runit-void-init
https://github.com/void-linux/void-packages/pull/29115

runit-void: split package into main package and init controls
The runit-void package handles multiple duties. Th first is being the
base system configuration for all mainline void linux installs. The
second is handling the population of ownership of the init and power
controls (/usr/bin/halt, /usr/bin/shutdown, and the init, poweroff, and
reboot symlinks). Since those commands are required to manage a system,
anybody who wants to experiment with an alternate init scheme needs to
either put their init control elsewhere or clean up after any reloads of
runit-void.

The structure here is to split the commands required to start or stop a
system away from the configuration and services that make up the core of
Void. Core functionality continues to be provided by runit-void but it
is adjusted to depend on a virutal package called "void-init" for the
init and power commands.  In mainline Void systems "void-init" is
provided by runit-void-init, a subpackage built alongside runit-void,
however this change allows any package to provide that functionality
without breaking the core distribution configuration.

From a package management perspective runit-void-init provides void-init
and replaces void-init. This allows for a single-pass replacement of any
other void-init providers simply by installing runit-void-init.
Similarly, an alternative init package can be installed in a single pass
via the same mechanisms without explicitly defining all packages that it
needs to override.

<!-- Mark items with [x] where applicable -->

#### General
- [X] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
It's technically a new package but mostly a rearrangement of functionality to allow for better experimentation.

A patch file from https://github.com/void-linux/void-packages/pull/29115.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-runit-void-init-29115.patch --]
[-- Type: text/x-diff, Size: 3015 bytes --]

From d65904b6454ecbe07efc636df9760ba04a466d79 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 14 Feb 2021 16:47:01 -0800
Subject: [PATCH] runit-void: use alternatives for init and power commands

The runit-void package handles multiple duties. Th first is being the
base system configuration for all mainline void linux installs. The
second is handling the population of ownership of the init and power
controls (/usr/bin/halt, /usr/bin/shutdown, and the init, poweroff, and
reboot symlinks). Since those commands are required to manage a system,
anybody who wants to experiment with an alternate init scheme needs to
do one of: put their init control elsewhere, hold runit-void,  or clean
up after any reloads of runit-void.

This change adds the suffix `-runit` to shutdown, halt, poweroff, and
reboot and then registers shutdown, halt, poweroff, reboot, and init
names with alternatives under the void-init group. This will allow other
inits to take over for runit-void in a non-destructive fashion and
allows for easy rollbacks even in the face of disaster.

Thanks to st3r4g for pointing me towards xbps-alternatives instead of
using a virtual package to handle the ownership flip-flop. It is a much
cleaner method with significantly more straightforward semantics, though
not without its pitfalls.
---
 srcpkgs/runit-void/template | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index c495a45a3de..6d93bb70ba4 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20200720
-revision=1
+revision=2
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
@@ -24,6 +24,13 @@ conf_files="
  /etc/sv/agetty-hvc0/conf
  /etc/sv/agetty-hvsi0/conf"
 
+alternatives="
+ void-init:init:/usr/bin/runit-init
+ void-init:halt:/usr/bin/halt-runit
+ void-init:poweroff:/usr/bin/poweroff-runit
+ void-init:reboot:/usr/bin/reboot-runit
+ void-init:shutdown:/usr/bin/shutdown-runit"
+
 make_dirs="
  /etc/zzz.d/suspend 0755 root root
  /etc/zzz.d/resume 0755 root root"
@@ -31,6 +38,10 @@ make_dirs="
 post_install() {
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
+	mv ${DESTDIR}/usr/bin/halt ${DESTDIR}/usr/bin/halt-runit
+	mv ${DESTDIR}/usr/bin/shutdown ${DESTDIR}/usr/bin/shutdown-runit
+	ln -sf halt-runit ${DESTDIR}/usr/bin/poweroff-runit
+	ln -sf halt-runit ${DESTDIR}/usr/bin/reboot-runit
 	vconf ${FILESDIR}/hostname
 	vconf ${FILESDIR}/os-release
 	vconf ${FILESDIR}/locale.conf
@@ -40,7 +51,9 @@ post_install() {
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/default
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/single
-	ln -s runit-init ${DESTDIR}/usr/bin/init
+	# Remove extraneous power symlinks
+	rm ${DESTDIR}/usr/bin/poweroff
+	rm ${DESTDIR}/usr/bin/reboot
 }
 
 runit-void-apparmor_package() {