Blame 0028-iscsi-nbd-do-not-fail-in-hostonly-mode.patch

Harald Hoyer 4734ec
From c2ab99093817d4694c0360b77845b8f2a8a10caf Mon Sep 17 00:00:00 2001
Harald Hoyer 4734ec
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 4734ec
Date: Mon, 11 Nov 2013 16:57:09 +0100
Harald Hoyer 4734ec
Subject: [PATCH] iscsi,nbd: do not fail in hostonly mode
Harald Hoyer 4734ec
Harald Hoyer 4734ec
---
Harald Hoyer 4734ec
 modules.d/95iscsi/module-setup.sh | 2 +-
Harald Hoyer 4734ec
 modules.d/95nbd/module-setup.sh   | 2 +-
Harald Hoyer 4734ec
 2 files changed, 2 insertions(+), 2 deletions(-)
Harald Hoyer 4734ec
Harald Hoyer 4734ec
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
Harald Hoyer 4734ec
index c8051bd..8379f4b 100755
Harald Hoyer 4734ec
--- a/modules.d/95iscsi/module-setup.sh
Harald Hoyer 4734ec
+++ b/modules.d/95iscsi/module-setup.sh
Harald Hoyer 4734ec
@@ -24,7 +24,7 @@ check() {
Harald Hoyer 4734ec
 
Harald Hoyer 4734ec
     [[ $hostonly ]] || [[ $mount_needs ]] && {
Harald Hoyer 4734ec
         pushd . >/dev/null
Harald Hoyer 4734ec
-        for_each_host_dev_and_slaves is_iscsi || return 1
Harald Hoyer 4734ec
+        for_each_host_dev_and_slaves is_iscsi || return 255
Harald Hoyer 4734ec
         popd >/dev/null
Harald Hoyer 4734ec
     }
Harald Hoyer 4734ec
     return 0
Harald Hoyer 4734ec
diff --git a/modules.d/95nbd/module-setup.sh b/modules.d/95nbd/module-setup.sh
Harald Hoyer 4734ec
index ac30823..37ace21 100755
Harald Hoyer 4734ec
--- a/modules.d/95nbd/module-setup.sh
Harald Hoyer 4734ec
+++ b/modules.d/95nbd/module-setup.sh
Harald Hoyer 4734ec
@@ -15,7 +15,7 @@ check() {
Harald Hoyer 4734ec
 
Harald Hoyer 4734ec
         _rootdev=$(find_root_block_device)
Harald Hoyer 4734ec
         [[ -b /dev/block/$_rootdev ]] || return 1
Harald Hoyer 4734ec
-        check_block_and_slaves is_nbd "$_rootdev" || return 1
Harald Hoyer 4734ec
+        check_block_and_slaves is_nbd "$_rootdev" || return 255
Harald Hoyer 4734ec
     }
Harald Hoyer 4734ec
 
Harald Hoyer 4734ec
     return 0