dkl-user-services: migrate to supervise-daemon

Dockerfile

@@ -1,8 +1,8 @@
 # ------------------------------------------------------------------------
-from mcluseau/golang-builder:1.19.4 as build
+from mcluseau/golang-builder:1.21.4 as build
 
 # ------------------------------------------------------------------------
-from alpine:3.17
+from alpine:3.18.4
 
 entrypoint mksquashfs /layer /layer.squashfs -noappend -comp xz >&2 && base64 </layer.squashfs
 

go.mod

@@ -1,6 +1,6 @@
 module novit.nc/direktil/inits
 
-go 1.19
+go 1.21
 
 require (
 	github.com/antage/mntent v0.0.0-20141129103236-834970000c6c

layer/etc/init.d/dkl-user-services

@@ -2,29 +2,12 @@
 
 description="Direktil user services."
 
-pidfile=/run/direktil/services.pid
+supervisor=supervise-daemon
+command="/sbin/dkl init services"
+
+pidfile=/run/dkl-init-services.pid
 
 depend()
 {
     need dkl-default
 }
-
-start()
-{
-    mkdir -p $(dirname $pidfile)
-
-    einfo "Starting Direktil services manager"
-    start-stop-daemon --start \
-        --pidfile $pidfile \
-        --background \
-        --exec "/sbin/dkl" \
-        -- init services
-    eend $? "Failed to start Direktil services manager"
-}
-
-stop()
-{
-    einfo "Stopping Direktil services manager"
-    start-stop-daemon --stop --pidfile $pidfile
-    eend $? "Failed to stop Direktil services manager"
-}

layer/etc/runlevels/boot/dkl-boot

@@ -1 +0,0 @@
-../../init.d/dkl-boot