Blame SOURCES/0182-deprecate-ip-ibft-kernel-command-line-parameter.patch

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