Add /oem/system/discovery

Generate instead of enabling both services

dracut/29kcrypt/generator.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
+GENERATOR_DIR="$2"
+
+[ -z "$GENERATOR_DIR" ] && exit 1
+[ -d "$GENERATOR_DIR" ] || mkdir "$GENERATOR_DIR"
+
+if getargbool 0 rd.neednet; then
+    {
+        echo "[Unit]"
+        echo "DefaultDependencies=no"
+        echo "Description=kcrypt online mount"
+        echo "Before=cos-immutable-rootfs.service"
+        echo "After=network-online.target"
+        echo "Wants=network-online.target"
+        echo "[Service]"
+        echo "Type=oneshot"
+        echo "RemainAfterExit=no"
+        echo "ExecStart=/sbin/kcrypt-mount-local"
+    } > "$GENERATOR_DIR"/kcrypt.service
+else
+    {
+        echo "[Unit]"
+        echo "DefaultDependencies=no"
+        echo "Description=kcrypt mount"
+        echo "Before=cos-immutable-rootfs.service"
+        echo "[Service]"
+        echo "Type=oneshot"
+        echo "RemainAfterExit=no"
+        echo "ExecStart=/sbin/kcrypt-mount-local"
+    } > "$GENERATOR_DIR"/kcrypt.service
+fi
+
+if [ ! -e "$GENERATOR_DIR/initrd-fs.target.requires/kcrypt.service" ]; then
+    mkdir -p "$GENERATOR_DIR"/initrd-fs.target.requires
+    ln -s "$GENERATOR_DIR"/kcrypt.service \
+        "$GENERATOR_DIR"/initrd-fs.target.requires/kcrypt.service
+fi

dracut/29kcrypt/kcrypt.service

@@ -1,9 +0,0 @@
-[Unit]
-Description=kcrypt mount
-DefaultDependencies=no
-Before=cos-immutable-rootfs.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/sbin/kcrypt-mount-local

dracut/29kcrypt/module-setup.sh

@@ -29,10 +29,8 @@ install() {
         kcrypt
     inst_script "${moddir}/mount-local.sh" "/sbin/kcrypt-mount-local"
     #inst_hook pre-trigger 10 "$moddir/mount-local.sh"
-    inst_simple "${moddir}/kcrypt.service" \
-        "${systemdsystemunitdir}/kcrypt.service"
-    mkdir -p "${initdir}/${systemdsystemunitdir}/initrd-fs.target.requires"
-    ln_r "../kcrypt.service" \
-        "${systemdsystemunitdir}/initrd-fs.target.requires/kcrypt.service"
+    inst_script "${moddir}/generator.sh" \
+        "${systemdutildir}/system-generators/dracut-kcrypt-generator"
+
     dracut_need_initqueue
 }

dracut/29kcrypt/mount-local.sh

@@ -2,6 +2,10 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
+type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+
 OEM=$(blkid -L COS_OEM)
 if [ "$OEM" != "" ]; then
     mkdir /oem

pkg/bus/bus.go

@@ -28,7 +28,7 @@ type Bus struct {
 
 func (b *Bus) LoadProviders() {
 	wd, _ := os.Getwd()
-	b.Manager.Autoload("kcrypt-discovery", "/system/discovery", "/oem/kcrypt", wd).Register()
+	b.Manager.Autoload("kcrypt-discovery", "/system/discovery", "/oem/kcrypt", "/oem/system/discovery", wd).Register()
 }
 
 func (b *Bus) Initialize() {