update for use with libudev-zero

5 files changed, 77 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7e6299515d1..fb3bb02f46ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nldev-runit
 	pkgdesc = runit service scripts for nldev
-	pkgver = 20181226
+	pkgver = 20210602
 	pkgrel = 1
 	arch = any
 	license = MIT/X
@@ -9,9 +9,12 @@ pkgbase = nldev-runit
 	source = nldev.run
 	source = nldev.conf
 	source = nltrigger.run
-	sha256sums = cec0065df70a4f1416cfb2e55d62ce006244ff99e102b4928cf8637c9ab38f7f
+	source = nldev.early
+	source = nltrigger.early
+	sha256sums = 811ac122ce19056b4d87588f3aed9a490cc5590dd13d4004760534108479b8a0
 	sha256sums = 970bc31081ea9a46f6b03d5f593a18920b830da5d7dc8e625566dffbb05362e2
 	sha256sums = 08e171df7501cbd7dbd5ef820bed5f4e572fb28cc64daa05bc83144d77aa1a5e
+	sha256sums = 538804d8f2d042d6a1dde2dd657711328baeddfdca80b68ea9583580033ee060
+	sha256sums = 079b80e78135ad0097f83a52b321262fe8c3f3f37a4526ba9b256512ea86bf97
 
 pkgname = nldev-runit
-
diff --git a/PKGBUILD b/PKGBUILD
index c8cbc1d0c934..ac2335fa0e5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _sed_args=(-e 's|/var/service|/run/runit/service|g' -e 's|/var/run|/run|g' -e 's|/usr/sbin|/usr/bin|g' -e 's|/opt/bin|/usr/bin|g' -e 's|/usr/libexec|/usr/lib|g')
 
 pkgname=nldev-runit
-pkgver=20181226
+pkgver=20210602
 pkgrel=1
 pkgdesc="runit service scripts for nldev"
 arch=('any')
@@ -11,10 +11,14 @@ license=('MIT/X')
 depends=('nldev' 'runit')
 source=("nldev.run"
         "nldev.conf"
-        "nltrigger.run")
-sha256sums=('cec0065df70a4f1416cfb2e55d62ce006244ff99e102b4928cf8637c9ab38f7f'
+        "nltrigger.run"
+        "nldev.early"
+        "nltrigger.early")
+sha256sums=('811ac122ce19056b4d87588f3aed9a490cc5590dd13d4004760534108479b8a0'
             '970bc31081ea9a46f6b03d5f593a18920b830da5d7dc8e625566dffbb05362e2'
-            '08e171df7501cbd7dbd5ef820bed5f4e572fb28cc64daa05bc83144d77aa1a5e')
+            '08e171df7501cbd7dbd5ef820bed5f4e572fb28cc64daa05bc83144d77aa1a5e'
+            '538804d8f2d042d6a1dde2dd657711328baeddfdca80b68ea9583580033ee060'
+            '079b80e78135ad0097f83a52b321262fe8c3f3f37a4526ba9b256512ea86bf97')
 
 _inst_sv() {
     if test -f "$srcdir/$1.conf"; then
@@ -32,4 +36,11 @@ _inst_sv() {
 package() {
     _inst_sv 'nldev'
     _inst_sv 'nltrigger'
+
+    install -Dm755 "${srcdir}/nldev.early" "${pkgdir}/usr/lib/rc/sv.d/nldev"
+    install -Dm755 "${srcdir}/nltrigger.early" "${pkgdir}/usr/lib/rc/sv.d/nltrigger"
+    install -d ${pkgdir}/etc/rc/{sysinit,shutdown}
+    ln -sf /usr/lib/rc/sv.d/nldev ${pkgdir}/etc/rc/sysinit/30-nldev
+    ln -sf /usr/lib/rc/sv.d/nldev ${pkgdir}/etc/rc/shutdown/30-nldev
+    ln -sf /usr/lib/rc/sv.d/nltrigger ${pkgdir}/etc/rc/shutdown/31-nltrigger
 }
diff --git a/nldev.early b/nldev.early
new file mode 100644
index 000000000000..b022c2438f5b
--- /dev/null
+++ b/nldev.early
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# sourcing our current rc.conf requires this to be a bash script
+. /usr/lib/rc/functions
+
+case "$1" in
+    start)
+        stat_busy "Starting nldev daemon"
+        mkdir /run/libudev-zero
+        bus create /run/udev-bus
+        bus chmod 644 /run/udev-bus
+        nldev -r /usr/bin/smdev &
+        echo $! > /run/nldev.pid
+        # Note: This is only needed for initialization, nldev will
+        #       be controlled by runit on stage 2.
+        add_daemon nldev
+        stat_done nldev
+        ;;
+    stop)
+        stat_busy "Stopping nldev"
+        # check whether nldev might still be running.
+        ! pgrep -f "nldev" >/dev/null 2>&1 || killall nldev || stat_die nldev
+        rm_daemon nldev
+        stat_done nldev
+        ;;
+    *)
+        echo "usage: $0 {start|stop}"
+        exit 1
+        ;;
+esac
+
diff --git a/nldev.run b/nldev.run
index 7688b521d7a3..ff03addf5370 100644
--- a/nldev.run
+++ b/nldev.run
@@ -1,4 +1,9 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
+mkdir /run/libudev-zero
+[ -f /run/nldev.pid ] && {
+    kill $(cat /run/nldev.pid)
+    rm /run/nldev.pid
+}
 runpath=${runpath:-/usr/bin/smdev}
 exec nldev -r $runpath $optargs 2>&1
diff --git a/nltrigger.early b/nltrigger.early
new file mode 100644
index 000000000000..ae018138c13c
--- /dev/null
+++ b/nltrigger.early
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# sourcing our current rc.conf requires this to be a bash script
+. /usr/lib/rc/functions
+
+case "$1" in
+    start)
+        stat_busy "Triggering udev uevents"
+        nltrigger add all
+        ret=$?
+        (( ret )) && stat_die nltrigger
+        add_daemon nltrigger
+        stat_done nltrigger
+        ;;
+    *)
+        echo "usage: $0 {start}"
+        exit 1
+        ;;
+esac
+