From: Harald Hoyer <harald@redhat.com>
Date: Wed, 12 May 2021 13:12:54 +0000 (+0200)
Subject: fix(nbd): assume nbd version >= 3.8
X-Git-Tag: 054~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6209edeb5c7783d94867829bf052aa53c78a1efe;p=thirdparty%2Fdracut.git

fix(nbd): assume nbd version >= 3.8

This reduces the quirks.
---

diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh
index 50322747f..b1a80308a 100755
--- a/modules.d/95nbd/nbdroot.sh
+++ b/modules.d/95nbd/nbdroot.sh
@@ -124,22 +124,14 @@ EOF
     # to create the /sysroot mount.
 fi
 
-# supported since nbd 3.8 via 77e97612
-if strstr "$(nbd-client --help 2>&1)" "systemd-mark"; then
-    preopts="-systemd-mark $preopts"
-fi
-
 if ! [ "$nbdport" -gt 0 ] 2> /dev/null; then
     nbdport="-name $nbdport"
 fi
 
 if ! nbd-client -check /dev/nbd0 > /dev/null; then
     # shellcheck disable=SC2086
-    nbd-client "$nbdserver" $nbdport /dev/nbd0 $preopts $opts || exit 1
+    nbd-client -p -systemd-mark "$nbdserver" $nbdport /dev/nbd0 $opts || exit 1
 fi
 
-# NBD doesn't emit uevents when it gets connected, so kick it
-echo change > /sys/block/nbd0/uevent
-udevadm settle
 need_shutdown
 exit 0