Skip to content

Commit 6209ede

Browse files
committed
fix(nbd): assume nbd version >= 3.8
This reduces the quirks.
1 parent 66b920c commit 6209ede

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

modules.d/95nbd/nbdroot.sh

+1-9
Original file line numberDiff line numberDiff line change
@@ -124,22 +124,14 @@ EOF
124124
# to create the /sysroot mount.
125125
fi
126126

127-
# supported since nbd 3.8 via 77e97612
128-
if strstr "$(nbd-client --help 2>&1)" "systemd-mark"; then
129-
preopts="-systemd-mark $preopts"
130-
fi
131-
132127
if ! [ "$nbdport" -gt 0 ] 2> /dev/null; then
133128
nbdport="-name $nbdport"
134129
fi
135130

136131
if ! nbd-client -check /dev/nbd0 > /dev/null; then
137132
# shellcheck disable=SC2086
138-
nbd-client "$nbdserver" $nbdport /dev/nbd0 $preopts $opts || exit 1
133+
nbd-client -p -systemd-mark "$nbdserver" $nbdport /dev/nbd0 $opts || exit 1
139134
fi
140135

141-
# NBD doesn't emit uevents when it gets connected, so kick it
142-
echo change > /sys/block/nbd0/uevent
143-
udevadm settle
144136
need_shutdown
145137
exit 0

0 commit comments

Comments
 (0)