Remove custom unlock service + add networkd-dependency-generator

flatcar · Mar 12, 2024 · 32419d7 · 32419d7
1 parent 65a623c
commit 32419d7
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 60 deletions.
diff --git a/dracut/40clevis-unlock/clevis-network-generator b/dracut/40clevis-unlock/clevis-network-generator
diff --git a/dracut/40clevis-unlock/clevis-unlock.service b/dracut/40clevis-unlock/clevis-unlock.service
diff --git a/dracut/40clevis-unlock/module-setup.sh b/dracut/40clevis-unlock/module-setup.sh
diff --git a/dracut/40networkd-dependency/module-setup.sh b/dracut/40networkd-dependency/module-setup.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+depends() {
+    echo systemd
+}
+
+install() {
+    inst_simple "$moddir/networkd-dependency-generator" \
+        "$systemdutildir/system-generators/networkd-dependency-generator"
+}
diff --git a/dracut/40networkd-dependency/networkd-dependency-generator b/dracut/40networkd-dependency/networkd-dependency-generator
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+UNIT_DIR="$1"
+
+if cat /proc/cmdline | grep -qw "rd.networkd=1"; then
+    mkdir -p "${UNIT_DIR}/dracut-initqueue.service.d"
+
+    cat >${UNIT_DIR}/dracut-initqueue.service.d/networkd_dependency.conf <<EOF
+    # Automatically generated by networkd-dependency-generator
+
+    [Unit]
+    Wants=systemd-networkd.service systemd-resolved.service network-online.target
+    After=systemd-networkd.service systemd-resolved.service network-online.target
+EOF
+fi