|
 |
18971c |
From 6db59a1630f80ab4a5d6a701f3063aa5a6aaccc9 Mon Sep 17 00:00:00 2001
|
|
|
18971c |
From: Harald Hoyer <harald@redhat.com>
|
|
|
18971c |
Date: Fri, 20 Jun 2014 14:27:09 +0200
|
|
|
18971c |
Subject: [PATCH] deprecate "ip=ibft" kernel command line parameter
|
|
|
18971c |
|
|
|
18971c |
rd.iscsi.ibft[=1] should be used instead.
|
|
|
18971c |
|
|
|
18971c |
Thing is, 'ip=ibft' is not really an ip setting, but rather a marker
|
|
|
18971c |
that iBFT should be evaluated.
|
|
|
18971c |
|
|
|
18971c |
Also removed the trigger of the warning:
|
|
|
18971c |
"Warning: Please supply bootdev argument for multiple ip= lines"
|
|
|
18971c |
|
|
|
18971c |
(cherry picked from commit 5580e4c176c92624054691a8e12cffe8622cc1a0)
|
|
|
18971c |
---
|
|
|
18971c |
dracut.cmdline.7.asc | 7 ++++---
|
|
|
18971c |
modules.d/40network/parse-ibft.sh | 6 +++---
|
|
|
18971c |
modules.d/40network/parse-ip-opts.sh | 4 ++++
|
|
|
18971c |
3 files changed, 11 insertions(+), 6 deletions(-)
|
|
|
18971c |
|
|
|
18971c |
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
|
|
|
18971c |
index 985285b4..10550eef 100644
|
|
|
18971c |
--- a/dracut.cmdline.7.asc
|
|
|
18971c |
+++ b/dracut.cmdline.7.asc
|
|
|
18971c |
@@ -437,7 +437,7 @@ USB Android phone::
|
|
|
18971c |
* enp0s29u1u2
|
|
|
18971c |
=====================
|
|
|
18971c |
|
|
|
18971c |
-**ip=**__{dhcp|on|any|dhcp6|auto6|ibft}__::
|
|
|
18971c |
+**ip=**__{dhcp|on|any|dhcp6|auto6}__::
|
|
|
18971c |
dhcp|on|any::: get ip from dhcp server from all interfaces. If root=dhcp,
|
|
|
18971c |
loop sequentially through all interfaces (eth0, eth1, ...) and use the first
|
|
|
18971c |
with a valid DHCP root-path.
|
|
|
18971c |
@@ -446,8 +446,6 @@ USB Android phone::
|
|
|
18971c |
|
|
|
18971c |
dhcp6::: IPv6 DHCP
|
|
|
18971c |
|
|
|
18971c |
- ibft::: iBFT autoconfiguration
|
|
|
18971c |
-
|
|
|
18971c |
**ip=**__<interface>__:__{dhcp|on|any|dhcp6|auto6}__[:[__<mtu>__][:__<macaddr>__]]::
|
|
|
18971c |
This parameter can be specified multiple times.
|
|
|
18971c |
+
|
|
|
18971c |
@@ -661,6 +659,9 @@ will result in
|
|
|
18971c |
iscsistart -b --param node.session.timeo.replacement_timeout=30
|
|
|
18971c |
--
|
|
|
18971c |
|
|
|
18971c |
+**rd.iscsi.ibft** **rd.iscsi.ibft=1**:
|
|
|
18971c |
+ Turn on iBFT autoconfiguration for the interfaces
|
|
|
18971c |
+
|
|
|
18971c |
FCoE
|
|
|
18971c |
~~~~
|
|
|
18971c |
**fcoe=**__<edd|interface|MAC>__:__{dcb|nodcb}__::
|
|
|
18971c |
diff --git a/modules.d/40network/parse-ibft.sh b/modules.d/40network/parse-ibft.sh
|
|
|
18971c |
index 9776c755..643313dc 100755
|
|
|
18971c |
--- a/modules.d/40network/parse-ibft.sh
|
|
|
18971c |
+++ b/modules.d/40network/parse-ibft.sh
|
|
|
18971c |
@@ -5,6 +5,6 @@
|
|
|
18971c |
command -v getarg >/dev/null || . /lib/dracut-lib.sh
|
|
|
18971c |
command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh
|
|
|
18971c |
|
|
|
18971c |
-# If ibft is requested, read ibft vals and write ip=XXX cmdline args
|
|
|
18971c |
-[ "ibft" = "$(getarg ip=)" ] && ibft_to_cmdline
|
|
|
18971c |
-
|
|
|
18971c |
+if getargbool 0 rd.iscsi.ibft -d "ip=ibft"; then
|
|
|
18971c |
+ ibft_to_cmdline
|
|
|
18971c |
+fi
|
|
|
18971c |
diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
|
|
|
18971c |
index 7e735741..b029d007 100755
|
|
|
18971c |
--- a/modules.d/40network/parse-ip-opts.sh
|
|
|
18971c |
+++ b/modules.d/40network/parse-ip-opts.sh
|
|
|
18971c |
@@ -25,6 +25,10 @@ fi
|
|
|
18971c |
if [ -z "$NEEDBOOTDEV" ] ; then
|
|
|
18971c |
count=0
|
|
|
18971c |
for p in $(getargs ip=); do
|
|
|
18971c |
+ case "$p" in
|
|
|
18971c |
+ ibft)
|
|
|
18971c |
+ continue;;
|
|
|
18971c |
+ esac
|
|
|
18971c |
count=$(( $count + 1 ))
|
|
|
18971c |
done
|
|
|
18971c |
[ $count -gt 1 ] && NEEDBOOTDEV=1
|