sunjizzle/diskless-workstation
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

pivot to a systemd unit for the online hook

Browse Source
This commit is contained in:
Audiobuzz
2026-06-15 08:52:19 +00:00
parent 2eefd97c50
commit 62e49e6b42
6 changed files with 88 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
files/dracut/95dot1x-macsec/nvmf-connect.sh
+33 -26
View File
@@ -1,42 +1,49 @@
#!/bin/bash
# nvmf-connect.sh — initqueue/online hook (fires when a NIC comes online).
# nvmf-connect — ExecStart for nvmf-connect.service (initramfs, TEST MODE).
#
# TEST MODE ONLY (rd.dot1x=0): drive the NVMe-oF root connect here.
# This distro's dracut `nvmf` module parses rd.nvmf.discover into
# /etc/nvme/discovery.conf but registers NO autoconnect hook (initqueue/online/
# ships empty), and a job placed on the MAIN initqueue is not re-executed once
# the loop blocks waiting on udev events — so `nvme connect-all` otherwise never
# runs, the root namespace never appears, and boot spins on /dev/mapper/root
# forever. initqueue/online is the correct, event-driven place: network-legacy
# sources these hooks once DHCP is bound, so the link is guaranteed up here.
# Idempotent via a stamp; connect-all is itself safe to re-run, and on failure
# we leave the stamp unset so the next online event retries.
# Why a systemd unit and not a dracut hook: this initramfs is systemd-driven and
# does NOT source dracut initqueue/online hooks when the ip=dhcp link comes up
# (verified on the bench — the online hook installs but never fires: no log, no
# connect). dracut's nvmf module also registers no autoconnect, and a job placed
# on the main initqueue is never re-executed once the loop blocks on events. A
# oneshot unit ordered Before=initrd-root-device.target, with its own
# wait-for-network + connect loop, deterministically connects the NVMe-oF root
# namespace so the by-id device appears and systemd-veritysetup can map
# /dev/mapper/root.
#
# The secure path (rd.dot1x unset/!=0) connects over macsec0 from its own flow
# in dot1x-macsec-up.sh and must NOT connect over the physical link here.
# rd.dot1x=0 (open-network test) ONLY — the unit's ConditionKernelCommandLine
# already gates this, but re-check so the script is safe to run directly. The
# secure path connects over macsec0 from dot1x-macsec-up.sh.
type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
[ "$(getarg rd.dot1x=)" = "0" ] || exit 0
[ -e /run/dot1x/.nvmf-connected ] && exit 0
_disc=$(getarg rd.nvmf.discover=) # e.g. tcp,192.168.50.10,4420
[ -n "$_disc" ] || { warn "nvmf-connect: rd.nvmf.discover not set"; exit 0; }
[ -n "$_disc" ] || { echo "nvmf-connect: rd.nvmf.discover not set" >&2; exit 1; }
_trtype=${_disc%%,*}
_rest=${_disc#*,}
_traddr=${_rest%%,*}
_trsvcid=${_rest##*,}
# nvme_tcp is usually auto-loaded, but ensure it so connect-all can't fail on a
# missing /dev/nvme-fabrics.
# nvme_tcp is usually auto-loaded; ensure it so /dev/nvme-fabrics exists.
modprobe nvme_tcp 2>/dev/null
info "nvmf-connect: nvme connect-all ${_trtype}/${_traddr}/${_trsvcid}"
if nvme connect-all -t "$_trtype" -a "$_traddr" -s "$_trsvcid"; then
mkdir -p /run/dot1x
: > /run/dot1x/.nvmf-connected
info "nvmf-connect: connected — namespace + by-id link should appear shortly"
else
warn "nvmf-connect: connect-all failed; will retry on next online event"
fi
exit 0
# Networking (ip=dhcp) is brought up in parallel, so poll-and-connect until a
# fabrics namespace appears or we time out. connect-all is idempotent.
_i=0
while [ "$_i" -lt 60 ]; do
nvme connect-all -t "$_trtype" -a "$_traddr" -s "$_trsvcid" 2>/dev/null
for _ns in /dev/nvme[0-9]*n[0-9]*; do
if [ -b "$_ns" ]; then
mkdir -p /run/dot1x
: > /run/dot1x/.nvmf-connected
echo "nvmf-connect: connected ${_trtype}/${_traddr}/${_trsvcid} ($_ns)"
exit 0
fi
done
sleep 1
_i=$((_i + 1))
done
echo "nvmf-connect: timed out connecting ${_trtype}/${_traddr}/${_trsvcid}" >&2
exit 1