|
Harald Hoyer |
b3dfe7 |
From d976e193256407b7839b02cb888ea95a8d442180 Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
b3dfe7 |
From: Harald Hoyer <harald@hoyer.xyz>
|
|
Harald Hoyer |
b3dfe7 |
Date: Fri, 27 Oct 2017 09:10:22 +0200
|
|
Harald Hoyer |
b3dfe7 |
Subject: [PATCH] Merge pull request #298 from derekhiggins/master
|
|
Harald Hoyer |
b3dfe7 |
|
|
Harald Hoyer |
b3dfe7 |
Skip iscsi attachment if no info
|
|
Harald Hoyer |
b3dfe7 |
---
|
|
Harald Hoyer |
b3dfe7 |
modules.d/95iscsi/iscsiroot.sh | 5 +++--
|
|
Harald Hoyer |
b3dfe7 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
Harald Hoyer |
b3dfe7 |
|
|
Harald Hoyer |
b3dfe7 |
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
|
|
Harald Hoyer |
b3dfe7 |
index 379cc296..aefd263d 100755
|
|
Harald Hoyer |
b3dfe7 |
--- a/modules.d/95iscsi/iscsiroot.sh
|
|
Harald Hoyer |
b3dfe7 |
+++ b/modules.d/95iscsi/iscsiroot.sh
|
|
Harald Hoyer |
b3dfe7 |
@@ -44,8 +44,9 @@ fi
|
|
Harald Hoyer |
b3dfe7 |
handle_firmware()
|
|
Harald Hoyer |
b3dfe7 |
{
|
|
Harald Hoyer |
b3dfe7 |
if ! iscsistart -f; then
|
|
Harald Hoyer |
b3dfe7 |
- warn "iscistart: Could not get list of targets from firmware."
|
|
Harald Hoyer |
b3dfe7 |
- return 1
|
|
Harald Hoyer |
b3dfe7 |
+ warn "iscistart: Could not get list of targets from firmware. Skipping."
|
|
Harald Hoyer |
b3dfe7 |
+ echo 'skipped' > "/tmp/iscsistarted-firmware"
|
|
Harald Hoyer |
b3dfe7 |
+ return 0
|
|
Harald Hoyer |
b3dfe7 |
fi
|
|
Harald Hoyer |
b3dfe7 |
|
|
Harald Hoyer |
b3dfe7 |
for p in $(getargs rd.iscsi.param -d iscsi_param); do
|
|
Harald Hoyer |
b3dfe7 |
|