[PATCH] host: Configure s6-linux-init-shutdownd

[PATCH] host: Configure s6-linux-init-shutdownd

[Johannes Süllner]

Makes shutdown and reboot of the Spectrum host using `s6-linux-init-hpr`
possible.
Before, it would fail with "fatal: unable to talk to shutdownd:
Operation not permitted".
Pretty much just copied from commit 18b19f4dfdb1376d90f70f526052011502b97c40,
where this was added to application VMs, but not to the host.

Signed-off-by: Johannes Süllner <johannes.suellner@mailbox.org>
---
 host/rootfs/Makefile                                         | 4 +++-
 host/rootfs/file-list.mk                                     | 4 ++++
 .../service/s6-linux-init-shutdownd/notification-fd          | 1 +
 .../service/s6-linux-init-shutdownd/notification-fd.license  | 2 ++
 .../run-image/service/s6-linux-init-shutdownd/run            | 5 +++++
 host/rootfs/image/etc/s6-linux-init/scripts/rc.shutdown      | 5 +++++
 .../rootfs/image/etc/s6-linux-init/scripts/rc.shutdown.final | 3 +++
 7 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd
 create mode 100644 host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd.license
 create mode 100755 host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/run
 create mode 100755 host/rootfs/image/etc/s6-linux-init/scripts/rc.shutdown
 create mode 100755 host/rootfs/image/etc/s6-linux-init/scripts/rc.shutdown.final

diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile
index d528b12..5e90255 100644
--- a/host/rootfs/Makefile
+++ b/host/rootfs/Makefile
@@ -37,7 +37,9 @@ DIRS = \
 	run \
 	sys
 
-FIFOS = etc/s6-linux-init/run-image/service/s6-svscan-log/fifo
+FIFOS = \
+	etc/s6-linux-init/run-image/service/s6-svscan-log/fifo \
+	etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/fifo
 
 BUILD_FILES = build/etc/s6-rc
 
diff --git a/host/rootfs/file-list.mk b/host/rootfs/file-list.mk
index 7625c54..613a9e7 100644
--- a/host/rootfs/file-list.mk
+++ b/host/rootfs/file-list.mk
@@ -15,6 +15,8 @@ FILES = \
 	image/etc/s6-linux-init/run-image/service/getty-tty2/run \
 	image/etc/s6-linux-init/run-image/service/getty-tty3/run \
 	image/etc/s6-linux-init/run-image/service/getty-tty4/run \
+	image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd \
+	image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/run \
 	image/etc/s6-linux-init/run-image/service/s6-svscan-log/notification-fd \
 	image/etc/s6-linux-init/run-image/service/s6-svscan-log/run \
 	image/etc/s6-linux-init/run-image/service/serial-getty-generator/run \
@@ -37,6 +39,8 @@ FILES = \
 	image/etc/s6-linux-init/run-image/service/vmm/run \
 	image/etc/s6-linux-init/run-image/service/vmm/template/notification-fd \
 	image/etc/s6-linux-init/scripts/rc.init \
+	image/etc/s6-linux-init/scripts/rc.shutdown \
+	image/etc/s6-linux-init/scripts/rc.shutdown.final \
 	image/etc/udev/rules.d/99-spectrum.rules \
 	image/etc/xdg/weston/autolaunch \
 	image/etc/xdg/weston/weston.ini \
diff --git a/host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd b/host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd.license b/host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd.license
new file mode 100644
index 0000000..a941ca4
--- /dev/null
+++ b/host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notification-fd.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
diff --git a/host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/run b/host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/run
new file mode 100755
index 0000000..228fc6a
--- /dev/null
+++ b/host/rootfs/image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/run
@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+# SPDX-License-Identifier: EUPL-1.2+
+# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
+
+s6-linux-init-shutdownd -Bc /etc/s6-linux-init
diff --git a/host/rootfs/image/etc/s6-linux-init/scripts/rc.shutdown b/host/rootfs/image/etc/s6-linux-init/scripts/rc.shutdown
new file mode 100755
index 0000000..3b09c02
--- /dev/null
+++ b/host/rootfs/image/etc/s6-linux-init/scripts/rc.shutdown
@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+# SPDX-License-Identifier: EUPL-1.2+
+# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
+
+s6-rc -Dbav2 change
diff --git a/host/rootfs/image/etc/s6-linux-init/scripts/rc.shutdown.final b/host/rootfs/image/etc/s6-linux-init/scripts/rc.shutdown.final
new file mode 100755
index 0000000..7f48a65
--- /dev/null
+++ b/host/rootfs/image/etc/s6-linux-init/scripts/rc.shutdown.final
@@ -0,0 +1,3 @@
+#!/bin/execlineb -P
+# SPDX-License-Identifier: EUPL-1.2+
+# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
-- 
2.50.1

Re: [PATCH] host: Configure s6-linux-init-shutdownd

[Alyssa Ross]

This patch has been committed as d76e9b29aea9f31238d07e21db50d3fe6a80da5a,
which can be viewed online at
https://spectrum-os.org/git/spectrum/commit/?id=d76e9b29aea9f31238d07e21db50d3fe6a80da5a.

This is an automated message.  Send comments/questions/requests to:
Alyssa Ross <hi@alyssa.is>