Thomas Renninger
9fd4bf22aa
- dracut.sh: check for logfile (--logfile option) and create it if necessary Add 0139-dracut.sh-check-for-logfile-logfile-option-and-creat.patch - Avoid duplicate names in host_devs Add 0140-dracut.sh-Avoid-duplicate-devices-in-host_devs.patch - iscsi: Avoid bad ip route call on empty address Add 0141-iscsi-Avoid-bad-ip-route-call-on-empty-address.patch - 40network: Don't report error for .../ifroute-* during module setup Add 0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch - iscsi: Fix up ipv6 in brackets , iterate over all needed iscsi mounts Add 0143-iscsi-Fix-up-ipv6-in-brackets-iterate-over-all-possi.patch - 90crypt: Fixed crypttab_contains() to also work with device in /etc/crypttab Add 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch - 40network: handle 'ip=ifname:static' correctly (bnc#892801) Add 0145-40network-handle-ip-ifname-static-correctly.patch OBS-URL: https://build.opensuse.org/request/show/245581 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=180
30 lines
987 B
Diff
30 lines
987 B
Diff
From 0314d2a2e1483a6535db88f3038ff5a43259bafd Mon Sep 17 00:00:00 2001
|
|
From: Thomas Renninger <trenn@suse.de>
|
|
Date: Mon, 18 Aug 2014 19:06:13 +0200
|
|
Subject: iscsi: Avoid bad ip route call on empty address
|
|
|
|
Without this patch it will lead to:
|
|
Command line is not complete. Try option "help"
|
|
error messages on specific host devs.
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
---
|
|
modules.d/95iscsi/module-setup.sh | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
|
|
index f63634a..94eb023 100755
|
|
--- a/modules.d/95iscsi/module-setup.sh
|
|
+++ b/modules.d/95iscsi/module-setup.sh
|
|
@@ -76,6 +76,7 @@ install_iscsiroot() {
|
|
esac
|
|
done
|
|
|
|
+ [ -z "$iscsi_address" ] && return
|
|
local_address=$(ip -o route get to $iscsi_address | sed -n 's/.*src \([0-9a-f.:]*\).*/\1/p')
|
|
ifname=$(ip -o route get to $iscsi_address | sed -n 's/.*dev \([^ ]*\).*/\1/p')
|
|
printf 'ip=%s:static ' ${ifname}
|
|
--
|
|
1.8.4.5
|
|
|