Accept nbd_device from nbd_root=

Do not stop configuring nbd if nbddev= is missing from the kernel
commandline. The device may also be specified in nbdroot=.

Change-Id: Iad86c8b845a2ec24ad7c3a3c8e1100299a1c783b
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/scripts/init.sh b/scripts/init.sh
index 2b29f759026d912440fc941912cbf0b662c5a89b..b748e949aee2b22f5f42d4422d47f48fd397a25b 100755 (executable)
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -74,13 +74,6 @@ function setup_nbd()
     fi
 
     local NBDDEV=$([[ $(</proc/cmdline) =~ nbddev=([^ ]*) ]]; echo ${BASH_REMATCH[1]})
-    if [ "x$NBDDEV" = "x" ]; then
-        local NBDDEV=$([[ $(</proc/cmdline) =~ root=(/dev/nbd[^ ]*) ]]; echo ${BASH_REMATCH[1]})
-        if [ "x$NBDDEV" = "x" ]; then
-            return
-        fi
-    fi
-
     local nbd_device=$NBDDEV
 
     if [[ "$NBDROOT" =~ ([^:]*):([^:]*):([^:,]*)(,([^ ]*))? ]]; then