From 80917aef2fc31adee441f59a515887dd75d48bf8 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 8 Nov 2023 21:36:31 -0600
Subject: system/s6-linux-init: Add dracut module for hpr

s6-linux-init-hpr is needed in the initramfs environment for reboot and
poweroff to work.

Closes: #933
---
 system/s6-linux-init/APKBUILD         | 16 ++++++++++++----
 system/s6-linux-init/dracut_module.sh | 17 +++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100755 system/s6-linux-init/dracut_module.sh

(limited to 'system')

diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 1f25e1e83..9c2d7206e 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-linux-init
 pkgver=1.1.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A s6-based init system"
 url="https://skarnet.org/software/s6-linux-init/"
 arch="all"
@@ -12,8 +12,8 @@ _skalibs_version=2.14
 _s6_version=2.12
 depends="execline s6>=$_s6_version s6-linux-init-common"
 makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev"
-subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
-source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh earlygetty.run"
+subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc $pkgname-dracut"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh earlygetty.run dracut_module.sh"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 provides="/sbin/init=0"
 
@@ -111,6 +111,13 @@ libsdev() {
 }
 
 
+dracut() {
+	pkgdesc="$pkgdesc (Dracut module)"
+	install_if="$pkgname=$pkgver-r$pkgrel dracut"
+	install -D -m755 "$srcdir"/dracut_module.sh "$subpkgdir"/usr/lib/dracut/modules.d/99s6li/module-setup.sh
+}
+
+
 doc() {
         pkgdesc="$pkgdesc (documentation)"
         depends=""
@@ -124,4 +131,5 @@ sha512sums="76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887
 e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da  runlevel
 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4  rc.shutdown
 6fb2a1112988fd2322b4bc4862bfb948a1c2e43921c5d01ae873c0d31b39fe74fc2934a5018c08b1704a2b2199b31d3a3d7365be369bba734f153b74e000aa74  reboot.sh
-dfff483b61370ce2c8fe653cb4e9b6ec7ef678f26b128eab8e677548a48b668b532b12a2e4618c85bf95777a666ac30189780708803d6ea12e43ab0072399212  earlygetty.run"
+dfff483b61370ce2c8fe653cb4e9b6ec7ef678f26b128eab8e677548a48b668b532b12a2e4618c85bf95777a666ac30189780708803d6ea12e43ab0072399212  earlygetty.run
+a62cf543e64aaf24f16c0e3d23497890de7a4a621c9d8f93c447001ea56a21324046ee589188d11b3d4dbfea4a707b5a1889d2b703c00ea6a81207a0442f9799  dracut_module.sh"
diff --git a/system/s6-linux-init/dracut_module.sh b/system/s6-linux-init/dracut_module.sh
new file mode 100755
index 000000000..106025ca7
--- /dev/null
+++ b/system/s6-linux-init/dracut_module.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# called by dracut
+check() {
+    return 0
+}
+
+# called by dracut
+depends() {
+    return 0
+}
+
+# called by dracut
+install() {
+    inst /bin/s6-linux-init-hpr
+}
+
-- 
cgit v1.2.3-60-g2f50