|
 |
f709f2 |
From 93b0bbd54736259792ca77746ac8a6440c3ccd39 Mon Sep 17 00:00:00 2001
|
|
|
f709f2 |
From: The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>
|
|
|
f709f2 |
Date: Thu, 11 Aug 2022 09:49:54 +0200
|
|
|
f709f2 |
Subject: [PATCH] (#1933679) 95iscsi: Fix network setup
|
|
|
f709f2 |
|
|
|
f709f2 |
* 95iscsi: Fix network setup code for iscsi
|
|
|
f709f2 |
|
|
|
f709f2 |
- The network script and config could be in
|
|
|
f709f2 |
"/etc/sysconfig/network-scripts", so try look for network config in
|
|
|
f709f2 |
all possible path.
|
|
|
f709f2 |
|
|
|
f709f2 |
- The regex used for sed is not working, so fix it too.
|
|
|
f709f2 |
|
|
|
f709f2 |
- Make bootproto a local variable
|
|
|
f709f2 |
|
|
|
f709f2 |
* Update modules.d/95iscsi/module-setup.sh
|
|
|
f709f2 |
|
|
|
f709f2 |
Signed-off-by: Kairui Song <kasong@redhat.com>
|
|
|
f709f2 |
(cherry picked from commit 7b76fa924dfd20d3fd4433baa8292f0112282aac)
|
|
|
f709f2 |
|
|
|
f709f2 |
Resolves: #1933679
|
|
|
f709f2 |
---
|
|
|
f709f2 |
modules.d/95iscsi/module-setup.sh | 11 +++++++++--
|
|
|
f709f2 |
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
f709f2 |
|
|
|
f709f2 |
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
|
|
|
f709f2 |
index 618d1dc2..5bb97df6 100755
|
|
|
f709f2 |
--- a/modules.d/95iscsi/module-setup.sh
|
|
|
f709f2 |
+++ b/modules.d/95iscsi/module-setup.sh
|
|
|
f709f2 |
@@ -72,6 +72,7 @@ install_iscsiroot() {
|
|
|
f709f2 |
local devpath=$1
|
|
|
f709f2 |
local scsi_path iscsi_lun session c d conn host flash
|
|
|
f709f2 |
local iscsi_session iscsi_address iscsi_port iscsi_targetname iscsi_tpgt
|
|
|
f709f2 |
+ local bootproto
|
|
|
f709f2 |
|
|
|
f709f2 |
scsi_path=${devpath%%/block*}
|
|
|
f709f2 |
[ "$scsi_path" = "$devpath" ] && return 1
|
|
|
f709f2 |
@@ -120,8 +121,14 @@ install_iscsiroot() {
|
|
|
f709f2 |
local_address=$(ip -o route get to $iscsi_address | sed -n 's/.*src \([0-9a-f.:]*\).*/\1/p')
|
|
|
f709f2 |
ifname=$(ip -o route get to $iscsi_address | sed -n 's/.*dev \([^ ]*\).*/\1/p')
|
|
|
f709f2 |
|
|
|
f709f2 |
- #follow ifcfg settings for boot protocol
|
|
|
f709f2 |
- bootproto=$(sed -n "/BOOTPROTO/s/BOOTPROTO='\([[:alpha:]]*6\?\)4\?'/\1/p" /etc/sysconfig/network/ifcfg-$ifname)
|
|
|
f709f2 |
+ # follow ifcfg settings for boot protocol
|
|
|
f709f2 |
+ for _path in \
|
|
|
f709f2 |
+ "/etc/sysconfig/network-scripts/ifcfg-$ifname" \
|
|
|
f709f2 |
+ "/etc/sysconfig/network/ifcfg-$ifname" \
|
|
|
f709f2 |
+ ; do
|
|
|
f709f2 |
+ [ -r "$_path" ] && bootproto=$(sed -n "s/BOOTPROTO='\?\([[:alpha:]]*6\?\)4\?/\1/p" "$_path")
|
|
|
f709f2 |
+ done
|
|
|
f709f2 |
+
|
|
|
f709f2 |
if [ $bootproto ]; then
|
|
|
f709f2 |
printf 'ip=%s:%s ' ${ifname} ${bootproto}
|
|
|
f709f2 |
else
|
|
|
f709f2 |
|