Browse Source

deprecate "ip=ibft" kernel command line parameter

rd.iscsi.ibft[=1] should be used instead.

Thing is, 'ip=ibft' is not really an ip setting, but rather a marker
that iBFT should be evaluated.

Also removed the trigger of the warning:
"Warning: Please supply bootdev argument for multiple ip= lines"
master
Harald Hoyer 11 years ago
parent
commit
5580e4c176
  1. 7
      dracut.cmdline.7.asc
  2. 6
      modules.d/40network/parse-ibft.sh
  3. 4
      modules.d/40network/parse-ip-opts.sh

7
dracut.cmdline.7.asc

@ -437,7 +437,7 @@ USB Android phone::
* enp0s29u1u2 * enp0s29u1u2
===================== =====================


**ip=**__{dhcp|on|any|dhcp6|auto6|ibft}__:: **ip=**__{dhcp|on|any|dhcp6|auto6}__::
dhcp|on|any::: get ip from dhcp server from all interfaces. If root=dhcp, dhcp|on|any::: get ip from dhcp server from all interfaces. If root=dhcp,
loop sequentially through all interfaces (eth0, eth1, ...) and use the first loop sequentially through all interfaces (eth0, eth1, ...) and use the first
with a valid DHCP root-path. with a valid DHCP root-path.
@ -446,8 +446,6 @@ USB Android phone::


dhcp6::: IPv6 DHCP dhcp6::: IPv6 DHCP


ibft::: iBFT autoconfiguration

**ip=**__<interface>__:__{dhcp|on|any|dhcp6|auto6}__[:[__<mtu>__][:__<macaddr>__]]:: **ip=**__<interface>__:__{dhcp|on|any|dhcp6|auto6}__[:[__<mtu>__][:__<macaddr>__]]::
This parameter can be specified multiple times. This parameter can be specified multiple times.
+ +
@ -661,6 +659,9 @@ will result in
iscsistart -b --param node.session.timeo.replacement_timeout=30 iscsistart -b --param node.session.timeo.replacement_timeout=30
-- --


**rd.iscsi.ibft** **rd.iscsi.ibft=1**:
Turn on iBFT autoconfiguration for the interfaces

FCoE FCoE
~~~~ ~~~~
**fcoe=**__<edd|interface|MAC>__:__{dcb|nodcb}__:: **fcoe=**__<edd|interface|MAC>__:__{dcb|nodcb}__::

6
modules.d/40network/parse-ibft.sh

@ -5,6 +5,6 @@
command -v getarg >/dev/null || . /lib/dracut-lib.sh command -v getarg >/dev/null || . /lib/dracut-lib.sh
command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh


# If ibft is requested, read ibft vals and write ip=XXX cmdline args if getargbool 0 rd.iscsi.ibft -d "ip=ibft"; then
[ "ibft" = "$(getarg ip=)" ] && ibft_to_cmdline ibft_to_cmdline

fi

4
modules.d/40network/parse-ip-opts.sh

@ -25,6 +25,10 @@ fi
if [ -z "$NEEDBOOTDEV" ] ; then if [ -z "$NEEDBOOTDEV" ] ; then
count=0 count=0
for p in $(getargs ip=); do for p in $(getargs ip=); do
case "$p" in
ibft)
continue;;
esac
count=$(( $count + 1 )) count=$(( $count + 1 ))
done done
[ $count -gt 1 ] && NEEDBOOTDEV=1 [ $count -gt 1 ] && NEEDBOOTDEV=1

Loading…
Cancel
Save