From 3ca4ad45d0642ddae7350625c6c032a62c83909289d404d0fcc0c8721bb78420 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.com>
Date: Fri, 7 Oct 2016 08:44:57 +0000
Subject: [PATCH 1/2] Accepting request 431190 from
 home:hreinecke:branches:Base:System

- 90multipath: parse commandline option 'multipath=off' (bsc#1001691)
  *add 0307-90multipath-parse-kernel-commandline-option-multipat.patch

- 95fcoe: do not start fcoemon twice (bsc#1001512)
  *add 0225-95fcoe-do-not-start-fcoemon-twice.patch

- Reformat patch headers:
  *modify 0199-rd-iscsi-waitnet-default-false.patch
  *modify 0200-dracut_fix_multipath_without_config.patch
  *modify 0210-add_fcoe_uefi_check.patch
  *modify 0212-fcoe_reorder_init_path.patch
- Rediff patches to apply cleanly:
  *modify 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch
  *modify 0133-Allow-multiple-configurations-per-network-interface-.patch
  *modify 0170-iscsi-skip-ibft-invalid-dhcp.patch
  *modify 0218-40network-allow-persistent-interface-names.patch
- Remove spurious whitespaces:
  *modify 0169-network_set_mtu_macaddr_for_dhcp.patch
- 40network: print out correct prefix (bsc#996141)
  *modify 0125-40network-separate-mask-and-prefix.patch
- 95iscsi: setup bnx2i offload connection correctly (bsc#997598)
  *add 0224-95iscsi-setup-bnx2i-offload-connections-properly.patch
- Rename patches to match sequence number:
  *old: 0019-40network-Fix-race-condition-when-wait-for-networks.patch
  *new: 0012-40network-Fix-race-condition-when-wait-for-networks.patch
  *old: 0066-40network-always-start-netroot-in-ifup.sh.patch
  *new: 0013-40network-always-start-netroot-in-ifup.sh.patch

- rd.iscsi.waitnet should default to false in order for dracut to
  wait for the network devices (bsc#997598)

OBS-URL: https://build.opensuse.org/request/show/431190
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=267
---
 ...ace-condition-when-wait-for-networks.patch |  0
 ...work-always-start-netroot-in-ifup.sh.patch |  0
 ...use-Add-SUSE-specific-initrd-parsing.patch |  8 +-
 ...te-iBFT-scanning-code-to-handle-IPv6.patch | 18 +++--
 0125-40network-separate-mask-and-prefix.patch | 50 +++++++------
 ...onfigurations-per-network-interface-.patch | 74 +++++++++----------
 0169-network_set_mtu_macaddr_for_dhcp.patch   |  6 +-
 0170-iscsi-skip-ibft-invalid-dhcp.patch       |  4 +-
 0199-rd-iscsi-waitnet-default-false.patch     | 55 ++++++++++++++
 ...-dracut_fix_multipath_without_config.patch | 21 ++++--
 0210-add_fcoe_uefi_check.patch                | 17 +++--
 0212-fcoe_reorder_init_path.patch             | 18 ++++-
 ...ork-allow-persistent-interface-names.patch |  4 +-
 ...p-bnx2i-offload-connections-properly.patch | 50 +++++++++++++
 0225-95fcoe-do-not-start-fcoemon-twice.patch  | 32 ++++++++
 0306-90multipath-add-shutdown-script.patch    |  2 +-
 ...e-kernel-commandline-option-multipat.patch | 30 ++++++++
 dracut-installkernel                          |  4 +-
 dracut.changes                                | 55 +++++++++++++-
 dracut.spec                                   | 12 ++-
 20 files changed, 362 insertions(+), 98 deletions(-)
 rename 0019-40network-Fix-race-condition-when-wait-for-networks.patch => 0012-40network-Fix-race-condition-when-wait-for-networks.patch (100%)
 rename 0066-40network-always-start-netroot-in-ifup.sh.patch => 0013-40network-always-start-netroot-in-ifup.sh.patch (100%)
 create mode 100644 0199-rd-iscsi-waitnet-default-false.patch
 create mode 100644 0224-95iscsi-setup-bnx2i-offload-connections-properly.patch
 create mode 100644 0225-95fcoe-do-not-start-fcoemon-twice.patch
 create mode 100644 0307-90multipath-parse-kernel-commandline-option-multipat.patch

diff --git a/0019-40network-Fix-race-condition-when-wait-for-networks.patch b/0012-40network-Fix-race-condition-when-wait-for-networks.patch
similarity index 100%
rename from 0019-40network-Fix-race-condition-when-wait-for-networks.patch
rename to 0012-40network-Fix-race-condition-when-wait-for-networks.patch
diff --git a/0066-40network-always-start-netroot-in-ifup.sh.patch b/0013-40network-always-start-netroot-in-ifup.sh.patch
similarity index 100%
rename from 0066-40network-always-start-netroot-in-ifup.sh.patch
rename to 0013-40network-always-start-netroot-in-ifup.sh.patch
diff --git a/0059-99suse-Add-SUSE-specific-initrd-parsing.patch b/0059-99suse-Add-SUSE-specific-initrd-parsing.patch
index 4886280..31f3237 100644
--- a/0059-99suse-Add-SUSE-specific-initrd-parsing.patch
+++ b/0059-99suse-Add-SUSE-specific-initrd-parsing.patch
@@ -13,10 +13,10 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
  create mode 100755 modules.d/99suse/module-setup.sh
  create mode 100755 modules.d/99suse/parse-suse-initrd.sh
 
-Index: dracut-037/modules.d/99suse/module-setup.sh
+Index: dracut-042/modules.d/99suse/module-setup.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dracut-037/modules.d/99suse/module-setup.sh	2016-08-31 21:05:24.907316981 +0200
++++ dracut-042/modules.d/99suse/module-setup.sh	2015-06-24 18:02:09.081356075 +0200
 @@ -0,0 +1,8 @@
 +#!/bin/bash
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -26,10 +26,10 @@ Index: dracut-037/modules.d/99suse/module-setup.sh
 +install() {
 +    inst_hook cmdline 99 "$moddir/parse-suse-initrd.sh"
 +}
-Index: dracut-037/modules.d/99suse/parse-suse-initrd.sh
+Index: dracut-042/modules.d/99suse/parse-suse-initrd.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dracut-037/modules.d/99suse/parse-suse-initrd.sh	2016-08-31 21:06:01.317385393 +0200
++++ dracut-042/modules.d/99suse/parse-suse-initrd.sh	2015-06-24 18:02:09.081356075 +0200
 @@ -0,0 +1,51 @@
 +#!/bin/sh
 +# convert openSUSE / SLE initrd command lines into dracut ones
diff --git a/0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch b/0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch
index 3c081a0..e2fefb8 100644
--- a/0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch
+++ b/0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch
@@ -13,10 +13,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
  modules.d/40network/net-lib.sh | 48 +++++++++++++++++++++++++++++++++++++-----
  1 file changed, 43 insertions(+), 5 deletions(-)
 
-Index: dracut-044/modules.d/40network/net-lib.sh
-===================================================================
---- dracut-044.orig/modules.d/40network/net-lib.sh
-+++ dracut-044/modules.d/40network/net-lib.sh
+diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
+index 135c378..d41920a 100755
+--- a/modules.d/40network/net-lib.sh
++++ b/modules.d/40network/net-lib.sh
 @@ -241,23 +241,54 @@ ibft_to_cmdline() {
  
              [ -e /tmp/net.${dev}.has_ibft_config ] && continue
@@ -27,11 +27,12 @@ Index: dracut-044/modules.d/40network/net-lib.sh
 +            # Skip interfaces not used for booting
 +            (( $flags & 2 )) || continue
              [ -e ${iface}/dhcp ] && dhcp=$(read a < ${iface}/dhcp; echo $a)
-+            [ -e ${iface}/origin ] && origin=$(read a < ${iface}/origin; echo $a)
-+            [ -e ${iface}/ip-addr ] && ip=$(read a < ${iface}/ip-addr; echo $a)
- 
+-
 -            if [ -n "$dhcp" ]; then
 -                echo "ip=$dev:dhcp"
++            [ -e ${iface}/origin ] && origin=$(read a < ${iface}/origin; echo $a)
++            [ -e ${iface}/ip-addr ] && ip=$(read a < ${iface}/ip-addr; echo $a)
++
 +            if [ -n "$ip" ] ; then
 +                case "$ip" in
 +                    *.*.*.*)
@@ -90,3 +91,6 @@ Index: dracut-044/modules.d/40network/net-lib.sh
  
      # ip=<ipv4-address> means anaconda-style static config argument cluster:
      # ip=<ip> gateway=<gw> netmask=<nm> hostname=<host> mtu=<mtu>
+-- 
+2.6.6
+
diff --git a/0125-40network-separate-mask-and-prefix.patch b/0125-40network-separate-mask-and-prefix.patch
index 6497111..a2bb380 100644
--- a/0125-40network-separate-mask-and-prefix.patch
+++ b/0125-40network-separate-mask-and-prefix.patch
@@ -1,4 +1,4 @@
-From 50f59d60577283b71da5424e30d0c5981fb74f71 Mon Sep 17 00:00:00 2001
+From de3ab1c75c5f97a9935db4ce9f0cba332e5ca1ee Mon Sep 17 00:00:00 2001
 From: Hannes Reinecke <hare@suse.de>
 Date: Fri, 18 Jul 2014 10:28:00 +0200
 Subject: 40network: separate 'mask' and 'prefix'
@@ -14,14 +14,14 @@ References: bnc#887542
 Signed-off-by: Hannes Reinecke <hare@suse.de>
 ---
  modules.d/40network/ifup.sh          |  9 ++++----
- modules.d/40network/net-lib.sh       | 42 +++++++++++++++++++++++++++++++++---
+ modules.d/40network/net-lib.sh       | 43 +++++++++++++++++++++++++++++++++---
  modules.d/40network/parse-ip-opts.sh |  2 +-
- 3 files changed, 45 insertions(+), 8 deletions(-)
+ 3 files changed, 46 insertions(+), 8 deletions(-)
 
-Index: dracut-044/modules.d/40network/ifup.sh
-===================================================================
---- dracut-044.orig/modules.d/40network/ifup.sh
-+++ dracut-044/modules.d/40network/ifup.sh
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index ef8828d..b384dab 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
 @@ -240,9 +240,10 @@ do_static() {
  
      [ -n "$macaddr" ] && ip link set address $macaddr dev $netif
@@ -61,11 +61,11 @@ Index: dracut-044/modules.d/40network/ifup.sh
          eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
      done > /tmp/net.$netif.override
  
-Index: dracut-044/modules.d/40network/net-lib.sh
-===================================================================
---- dracut-044.orig/modules.d/40network/net-lib.sh
-+++ dracut-044/modules.d/40network/net-lib.sh
-@@ -20,6 +20,35 @@ get_ip() {
+diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
+index d41920a..d963029 100755
+--- a/modules.d/40network/net-lib.sh
++++ b/modules.d/40network/net-lib.sh
+@@ -20,6 +20,36 @@ get_ip() {
      echo $ip
  }
  
@@ -74,7 +74,7 @@ Index: dracut-044/modules.d/40network/net-lib.sh
 +    local prefix=0
 +    local OLDIFS="$IFS"
 +
-+    IFS=:
++    IFS=.
 +    set -- $mask
 +    IFS="$OLDIFS"
 +    for mask in $@ ; do
@@ -96,12 +96,13 @@ Index: dracut-044/modules.d/40network/net-lib.sh
 +            prefix=$(($prefix + 1))
 +        fi
 +    done
++    echo $prefix
 +}
 +
  iface_for_remote_addr() {
      set -- $(ip -o route get to $1)
      echo $5
-@@ -232,7 +261,7 @@ ibft_to_cmdline() {
+@@ -232,7 +262,7 @@ ibft_to_cmdline() {
          for iface in /sys/firmware/ibft/ethernet*; do
              local mac="" dev=""
              local dhcp="" ip="" gw="" mask="" hostname=""
@@ -110,7 +111,7 @@ Index: dracut-044/modules.d/40network/net-lib.sh
  
              [ -e ${iface}/mac ] || continue
              mac=$(read a < ${iface}/mac; echo $a)
-@@ -280,6 +309,7 @@ ibft_to_cmdline() {
+@@ -280,6 +310,7 @@ ibft_to_cmdline() {
                  [ -e ${iface}/hostname ] && hostname=$(read a < ${iface}/hostname; echo $a)
                  if [ "$family" = "ipv6" ] ; then
                      if [ -n "$ip" ] ; then
@@ -118,7 +119,7 @@ Index: dracut-044/modules.d/40network/net-lib.sh
                          [ -n "$prefix" ] || prefix=64
                          ip="[${ip}/${prefix}]"
                          mask=
-@@ -287,6 +317,11 @@ ibft_to_cmdline() {
+@@ -287,6 +318,11 @@ ibft_to_cmdline() {
                      if [ -n "$gw" ] ; then
                          gw="[${gw}]"
                      fi
@@ -130,7 +131,7 @@ Index: dracut-044/modules.d/40network/net-lib.sh
                  fi
                  if [ -n "$ip" ] && [ -n "$mask" -o -n "$prefix" ]; then
                      echo "ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}"
-@@ -295,6 +330,7 @@ ibft_to_cmdline() {
+@@ -295,6 +331,7 @@ ibft_to_cmdline() {
                      warn "ip-addr=$ip"
                      warn "gateway=$gw"
                      warn "subnet-mask=$mask"
@@ -138,7 +139,7 @@ Index: dracut-044/modules.d/40network/net-lib.sh
                      warn "hostname=$hostname"
                  fi
              else
-@@ -442,7 +478,7 @@ ip_to_var() {
+@@ -442,7 +479,7 @@ ip_to_var() {
          fi
      done
  
@@ -147,7 +148,7 @@ Index: dracut-044/modules.d/40network/net-lib.sh
      case $# in
          0)  autoconf="error" ;;
          1)  autoconf=$1 ;;
-@@ -470,7 +506,7 @@ ip_to_var() {
+@@ -470,7 +507,7 @@ ip_to_var() {
      # Extract prefix length from CIDR notation
      case $ip in
          */*)
@@ -156,10 +157,10 @@ Index: dracut-044/modules.d/40network/net-lib.sh
              ip=${ip%/*}
              ;;
      esac
-Index: dracut-044/modules.d/40network/parse-ip-opts.sh
-===================================================================
---- dracut-044.orig/modules.d/40network/parse-ip-opts.sh
-+++ dracut-044/modules.d/40network/parse-ip-opts.sh
+diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
+index a3a3a3f..099a21c 100755
+--- a/modules.d/40network/parse-ip-opts.sh
++++ b/modules.d/40network/parse-ip-opts.sh
 @@ -79,7 +79,7 @@ for p in $(getargs ip=); do
              none|off)
                  [ -z "$ip" ] && \
@@ -169,3 +170,6 @@ Index: dracut-044/modules.d/40network/parse-ip-opts.sh
                      die "Sorry, automatic calculation of netmask is not yet supported"
                  ;;
              auto6);;
+-- 
+2.6.6
+
diff --git a/0133-Allow-multiple-configurations-per-network-interface-.patch b/0133-Allow-multiple-configurations-per-network-interface-.patch
index b72f1a7..407222a 100644
--- a/0133-Allow-multiple-configurations-per-network-interface-.patch
+++ b/0133-Allow-multiple-configurations-per-network-interface-.patch
@@ -5,17 +5,16 @@ Subject: Allow multiple configurations per network interface bnc#887906
 
 Signed-off-by: Julian Wolf <juwolf@suse.com>
 ---
- modules.d/40network/ifup.sh          |   91 ++++++++++++++++++++++------------
- modules.d/40network/net-genrules.sh  |    2 +-
- modules.d/40network/net-lib.sh       |    4 +-
- modules.d/40network/parse-ibft.sh    |    4 +-
- modules.d/40network/parse-ip-opts.sh |   14 ++---
- 5 files changed, 70 insertions(+), 45 deletions(-)
+ modules.d/40network/ifup.sh          | 90 +++++++++++++++++++++++-------------
+ modules.d/40network/net-genrules.sh  |  2 +-
+ modules.d/40network/net-lib.sh       |  4 +-
+ modules.d/40network/parse-ip-opts.sh | 14 +++---
+ 4 files changed, 66 insertions(+), 44 deletions(-)
 
-Index: dracut-044/modules.d/40network/ifup.sh
-===================================================================
---- dracut-044.orig/modules.d/40network/ifup.sh
-+++ dracut-044/modules.d/40network/ifup.sh
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index 1b71a3c..1cd1677 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
 @@ -90,6 +90,7 @@ else
  fi
  
@@ -24,7 +23,7 @@ Index: dracut-044/modules.d/40network/ifup.sh
      if [ -f /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} ]; then
          . /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
      else
-@@ -131,24 +132,37 @@ dhcp_apply() {
+@@ -131,23 +132,36 @@ dhcp_apply() {
      [ -n "${HOSTNAME}" ] && hostname "$HOSTNAME"
  
      # If nameserver= has not been specified, use what dhcp provides
@@ -46,10 +45,7 @@ Index: dracut-044/modules.d/40network/ifup.sh
              done
 -        fi >> /tmp/net.$netif.resolv.conf
 +        fi >> /tmp/net.$netif.resolv.conf.ipv${1:1:1}
-     fi
--    [ -e /tmp/net.$netif.resolv.conf ] && \
--        cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf
--
++    fi
 +    # copy resolv.conf if it doesn't exist yet, modify otherwise
 +    if [ -e /tmp/net.$netif.resolv.conf.ipv${1:1:1} ] && [ ! -e /etc/resolv.conf ]; then
 +        cp -f /tmp/net.$netif.resolv.conf.ipv${1:1:1} /etc/resolv.conf
@@ -64,11 +60,12 @@ Index: dracut-044/modules.d/40network/ifup.sh
 +                echo nameserver "$s"
 +            done
 +        fi >> /etc/resolv.conf
-+    fi
-+
+     fi
+-    [ -e /tmp/net.$netif.resolv.conf ] && \
+-        cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf
+ 
      info "DHCP is finished successfully"
      return 0
- }
 @@ -175,9 +189,6 @@ do_dhcp() {
          dhclient="wickedd-dhcp6"
      fi
@@ -136,11 +133,10 @@ Index: dracut-044/modules.d/40network/ifup.sh
  }
  
  # loopback is always handled the same way
-@@ -426,6 +458,14 @@ for p in $(getargs ip=); do
-     ip_to_var $p
+@@ -427,6 +459,14 @@ for p in $(getargs ip=); do
      # skip ibft
      [ "$autoconf" = "ibft" ] && continue
-+
+ 
 +    # skip if same configuration appears twice
 +    while read line
 +    do
@@ -148,9 +144,10 @@ Index: dracut-044/modules.d/40network/ifup.sh
 +    done < /tmp/net.${netif}.conf
 +
 +    echo $p >> /tmp/net.${netif}.conf
- 
++
      case "$dev" in
          ??:??:??:??:??:??)  # MAC address
+             _dev=$(iface_for_mac $dev)
 @@ -443,29 +483,12 @@ for p in $(getargs ip=); do
      [ "$use_bridge" != 'true' ] && \
      [ "$use_vlan" != 'true' ] && continue
@@ -200,11 +197,11 @@ Index: dracut-044/modules.d/40network/ifup.sh
 +        > /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
 +fi
  exit 0
-Index: dracut-044/modules.d/40network/net-genrules.sh
-===================================================================
---- dracut-044.orig/modules.d/40network/net-genrules.sh
-+++ dracut-044/modules.d/40network/net-genrules.sh
-@@ -96,7 +96,7 @@ command -v fix_bootif >/dev/null || . /l
+diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
+index 559b325..843bd98 100755
+--- a/modules.d/40network/net-genrules.sh
++++ b/modules.d/40network/net-genrules.sh
+@@ -96,7 +96,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
          # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
          if [ "$NEEDNET" = "1" ]; then
              echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
@@ -213,11 +210,11 @@ Index: dracut-044/modules.d/40network/net-genrules.sh
          fi
      fi
  
-Index: dracut-044/modules.d/40network/net-lib.sh
-===================================================================
---- dracut-044.orig/modules.d/40network/net-lib.sh
-+++ dracut-044/modules.d/40network/net-lib.sh
-@@ -130,6 +130,7 @@ ifdown() {
+diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
+index d963029..5aa1468 100755
+--- a/modules.d/40network/net-lib.sh
++++ b/modules.d/40network/net-lib.sh
+@@ -131,6 +131,7 @@ ifdown() {
      ip addr flush dev $netif
      echo "#empty" > /etc/resolv.conf
      rm -f -- /tmp/net.$netif.did-setup
@@ -225,7 +222,7 @@ Index: dracut-044/modules.d/40network/net-lib.sh
      [ -e /sys/class/net/$netif/address ] && \
          rm -f -- /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
      # TODO: send "offline" uevent?
-@@ -202,9 +203,6 @@ setup_net() {
+@@ -203,9 +204,6 @@ setup_net() {
      fi
      unset layer2
  
@@ -235,10 +232,10 @@ Index: dracut-044/modules.d/40network/net-lib.sh
  }
  
  save_netinfo() {
-Index: dracut-044/modules.d/40network/parse-ip-opts.sh
-===================================================================
---- dracut-044.orig/modules.d/40network/parse-ip-opts.sh
-+++ dracut-044/modules.d/40network/parse-ip-opts.sh
+diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
+index 099a21c..7926b6b 100755
+--- a/modules.d/40network/parse-ip-opts.sh
++++ b/modules.d/40network/parse-ip-opts.sh
 @@ -83,25 +83,23 @@ for p in $(getargs ip=); do
                      die "Sorry, automatic calculation of netmask is not yet supported"
                  ;;
@@ -271,3 +268,6 @@ Index: dracut-044/modules.d/40network/parse-ip-opts.sh
      fi
  
      # Do we need to check for specific options?
+-- 
+2.6.6
+
diff --git a/0169-network_set_mtu_macaddr_for_dhcp.patch b/0169-network_set_mtu_macaddr_for_dhcp.patch
index e5ef44d..cd9f1e8 100644
--- a/0169-network_set_mtu_macaddr_for_dhcp.patch
+++ b/0169-network_set_mtu_macaddr_for_dhcp.patch
@@ -1,4 +1,4 @@
-From 36691b5e707fca03d8a31b0c8a30e498465fbc1c Mon Sep 17 00:00:00 2001
+From b27ca9cfcb5df2066e87f673cb5c060bcf4016fa Mon Sep 17 00:00:00 2001
 From: Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>
 Date: Tue, 23 Aug 2016 12:29:03 +0200
 Subject: Set MTU and LLADDR for DHCP if specified
@@ -11,7 +11,7 @@ Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>
  1 file changed, 32 insertions(+), 20 deletions(-)
 
 diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 0aaea72..e101b52 100755
+index 0aaea72..3b92854 100755
 --- a/modules.d/40network/ifup.sh
 +++ b/modules.d/40network/ifup.sh
 @@ -90,7 +90,7 @@ else
@@ -75,7 +75,7 @@ index 0aaea72..e101b52 100755
 +        warn "Could not bring interface $netif up!"
 +        return 1
 +    fi
-+    
++
 +    if read_ifcfg ; then
 +        [ -n "$macaddr" ] && ip $1 link set address $macaddr dev $netif
 +        [ -n "$mtu" ] && ip $1 link set mtu $mtu dev $netif
diff --git a/0170-iscsi-skip-ibft-invalid-dhcp.patch b/0170-iscsi-skip-ibft-invalid-dhcp.patch
index 1cecb6f..93f07e5 100644
--- a/0170-iscsi-skip-ibft-invalid-dhcp.patch
+++ b/0170-iscsi-skip-ibft-invalid-dhcp.patch
@@ -11,10 +11,10 @@ Signed-off-by: Thomas Renninger <trenn@suse.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
-index 0fb594c..09aebb3 100755
+index 5aa1468..0a77d4b 100755
 --- a/modules.d/40network/net-lib.sh
 +++ b/modules.d/40network/net-lib.sh
-@@ -287,7 +287,7 @@ ibft_to_cmdline() {
+@@ -288,7 +288,7 @@ ibft_to_cmdline() {
                          ;;
                  esac
              fi
diff --git a/0199-rd-iscsi-waitnet-default-false.patch b/0199-rd-iscsi-waitnet-default-false.patch
new file mode 100644
index 0000000..dc2346c
--- /dev/null
+++ b/0199-rd-iscsi-waitnet-default-false.patch
@@ -0,0 +1,55 @@
+From fbd1ae50f37d4d904dc69844de869ff2daf02ded Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Tue, 27 Sep 2016 12:38:21 +0200
+Subject: 95iscsi: wait for network devices when starting iscsi
+
+rd.iscsi.waitnet should default to false in order for dracut to
+wait for any network devices to come up.
+
+References: bsc#997598
+
+Signed-off-by: Thomas Blume <thomas.blume@suse.com>
+---
+ modules.d/95iscsi/iscsiroot.sh | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
+index 77755fb..6f0a15d 100755
+--- a/modules.d/95iscsi/iscsiroot.sh
++++ b/modules.d/95iscsi/iscsiroot.sh
+@@ -62,13 +62,14 @@ handle_firmware()
+         warn "iscsiadm: Could not get list of targets from firmware."
+     else
+         ifaces=( $(echo /sys/firmware/ibft/ethernet*) )
+-        [ -f /tmp/session-retry ] || echo 1 > /tmp/session-retry
+         retry=$(cat /tmp/session-retry)
+ 
+         if [ $retry -lt ${#ifaces[*]} ]; then
+             let retry++
+             echo $retry > /tmp/session-retry
+             return 1
++        else
++            rm /tmp/session-retry
+         fi
+ 
+         if ! iscsiadm -m fw -l; then
+@@ -250,7 +251,7 @@ handle_netroot()
+ 
+ ret=0
+ 
+-if [ "$netif" != "timeout" ] && getargbool 1 rd.iscsi.waitnet; then
++if [ "$netif" != "timeout" ] && getargbool 0 rd.iscsi.waitnet; then
+     all_ifaces_setup || exit 0
+ fi
+ 
+@@ -264,6 +265,7 @@ fi
+ 
+ if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
+     if [ "$netif" = "timeout" ] || [ "$netif" = "online" ]; then
++        [ -f /tmp/session-retry ] || echo 1 > /tmp/session-retry
+         handle_firmware
+         ret=$?
+     fi
+-- 
+2.6.6
+
diff --git a/0200-dracut_fix_multipath_without_config.patch b/0200-dracut_fix_multipath_without_config.patch
index c1ce0dd..31b331c 100644
--- a/0200-dracut_fix_multipath_without_config.patch
+++ b/0200-dracut_fix_multipath_without_config.patch
@@ -1,4 +1,9 @@
+From 796000a6afd2fa20dc40eae053ee71480b16b49c Mon Sep 17 00:00:00 2001
 From: Hannes Reinecke <hare@suse.de>
+Date: Tue, 27 Sep 2016 12:40:22 +0200
+Subject: 90multipath: do not fail startup on missing configuration
+
+References: bsc#930019
 
 If rootfs is on multipath, but platform does not have an /etc/multipath.conf
 file which is not urgently needed, they system will not boot, due to:
@@ -11,14 +16,15 @@ systemctl status multipathd.service
 Condition: start condition failed at Thu 2015-05-07 11:49:11 CEST; 7min ago
            ConditionPathExists=/etc/multipath.conf was not met
 
-
 and exit to dracut shell.
+---
+ modules.d/90multipath/multipathd.service | 1 -
+ 1 file changed, 1 deletion(-)
 
-
-Index: dracut-042/modules.d/90multipath/multipathd.service
-===================================================================
---- dracut-042.orig/modules.d/90multipath/multipathd.service	2015-06-11 17:39:47.000000000 +0200
-+++ dracut-042/modules.d/90multipath/multipathd.service	2015-06-24 18:02:36.298905539 +0200
+diff --git a/modules.d/90multipath/multipathd.service b/modules.d/90multipath/multipathd.service
+index b64b02c..f7bc65f 100644
+--- a/modules.d/90multipath/multipathd.service
++++ b/modules.d/90multipath/multipathd.service
 @@ -6,7 +6,6 @@ Conflicts=shutdown.target
  ConditionKernelCommandLine=!nompath
  ConditionKernelCommandLine=!rd.multipath=0
@@ -27,3 +33,6 @@ Index: dracut-042/modules.d/90multipath/multipathd.service
  
  [Service]
  Type=simple
+-- 
+2.6.6
+
diff --git a/0210-add_fcoe_uefi_check.patch b/0210-add_fcoe_uefi_check.patch
index 513dda9..6ff7836 100644
--- a/0210-add_fcoe_uefi_check.patch
+++ b/0210-add_fcoe_uefi_check.patch
@@ -1,20 +1,22 @@
+From c5fd4748ecff45dfaf707af30b649153ae88ea20 Mon Sep 17 00:00:00 2001
 From: Fabian Vogt <fvogt@suse.com>
+Date: Tue, 27 Sep 2016 12:41:17 +0200
 Subject: fcoe-uefi: Add check for usage
+
 References: boo#965477
 
 fcoe-uefi gets included by default on EFI systems,
 as it does not do the same check that fcoe does,
 therefore needlessly pulling in network modules.
 This patch copies the check from fcoe to fcoe-uefi.
-
 ---
- modules.d/95fcoe-uefi/module-setup.sh |    5 +++++
+ modules.d/95fcoe-uefi/module-setup.sh | 5 +++++
  1 file changed, 5 insertions(+)
 
-Index: dracut-044/modules.d/95fcoe-uefi/module-setup.sh
-===================================================================
---- dracut-044.orig/modules.d/95fcoe-uefi/module-setup.sh
-+++ dracut-044/modules.d/95fcoe-uefi/module-setup.sh
+diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh
+index 5d8477c..66af804 100755
+--- a/modules.d/95fcoe-uefi/module-setup.sh
++++ b/modules.d/95fcoe-uefi/module-setup.sh
 @@ -4,6 +4,11 @@
  check() {
      [[ $hostonly ]] || [[ $mount_needs ]] && {
@@ -27,3 +29,6 @@ Index: dracut-044/modules.d/95fcoe-uefi/module-setup.sh
      }
      require_binaries dcbtool fipvlan lldpad ip readlink || return 1
      return 0
+-- 
+2.6.6
+
diff --git a/0212-fcoe_reorder_init_path.patch b/0212-fcoe_reorder_init_path.patch
index f9954c3..07422cf 100644
--- a/0212-fcoe_reorder_init_path.patch
+++ b/0212-fcoe_reorder_init_path.patch
@@ -1,8 +1,19 @@
+From 77b3a15c6673dfce2dbd76cceffb7d5d4819c694 Mon Sep 17 00:00:00 2001
 From: Johannes Thumshirn <jthumshirn@suse.com>
+Date: Tue, 27 Sep 2016 12:41:22 +0200
+Subject: 95fcoe: Reorder initialisation for bnx2x
+
 References: bsc#982588
 
---- a/modules.d/95fcoe/fcoe-up.sh	
-+++ b/modules.d/95fcoe/fcoe-up.sh	
+Signed-off-by: Johannes Thumshirn <jthumshirn@suse.com>
+---
+ modules.d/95fcoe/fcoe-up.sh | 22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
+index fb3b4c4..a525ade 100755
+--- a/modules.d/95fcoe/fcoe-up.sh
++++ b/modules.d/95fcoe/fcoe-up.sh
 @@ -45,7 +45,16 @@ write_fcoemon_cfg() {
      echo MODE=\"fabric\" >> /etc/fcoe/cfg-$netif
  }
@@ -42,3 +53,6 @@ References: bsc#982588
  fi
  
  need_shutdown
+-- 
+2.6.6
+
diff --git a/0218-40network-allow-persistent-interface-names.patch b/0218-40network-allow-persistent-interface-names.patch
index 5fc378b..49b194d 100644
--- a/0218-40network-allow-persistent-interface-names.patch
+++ b/0218-40network-allow-persistent-interface-names.patch
@@ -14,10 +14,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.com>
  1 file changed, 9 deletions(-)
 
 diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
-index 09aebb3..b19c177 100755
+index 0a77d4b..d17209a 100755
 --- a/modules.d/40network/net-lib.sh
 +++ b/modules.d/40network/net-lib.sh
-@@ -572,15 +572,6 @@ parse_ifname_opts() {
+@@ -573,15 +573,6 @@ parse_ifname_opts() {
              ;;
      esac
  
diff --git a/0224-95iscsi-setup-bnx2i-offload-connections-properly.patch b/0224-95iscsi-setup-bnx2i-offload-connections-properly.patch
new file mode 100644
index 0000000..84b3003
--- /dev/null
+++ b/0224-95iscsi-setup-bnx2i-offload-connections-properly.patch
@@ -0,0 +1,50 @@
+From 3ac0a07b762d115b385aa05abcb0c1559f932319 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Tue, 27 Sep 2016 12:51:09 +0200
+Subject: 95iscsi: setup bnx2i offload connections properly
+
+bnx2i offload connections do not have a corresponding network
+device, but needs the 'iscsiuio' daemon to be started.
+
+References: bsc#997598
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ modules.d/95iscsi/iscsiroot.sh    | 8 +++-----
+ modules.d/95iscsi/module-setup.sh | 1 +
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
+index 6f0a15d..6ad279f 100755
+--- a/modules.d/95iscsi/iscsiroot.sh
++++ b/modules.d/95iscsi/iscsiroot.sh
+@@ -264,11 +264,9 @@ if [ "$netif" = "timeout" ] && all_ifaces_setup; then
+ fi
+ 
+ if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
+-    if [ "$netif" = "timeout" ] || [ "$netif" = "online" ]; then
+-        [ -f /tmp/session-retry ] || echo 1 > /tmp/session-retry
+-        handle_firmware
+-        ret=$?
+-    fi
++    [ -f /tmp/session-retry ] || echo 1 > /tmp/session-retry
++    handle_firmware
++    ret=$?
+ fi
+ 
+ if ! [ "$netif" = "online" ]; then
+diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
+index 797d4e1..e272b24 100755
+--- a/modules.d/95iscsi/module-setup.sh
++++ b/modules.d/95iscsi/module-setup.sh
+@@ -279,6 +279,7 @@ install() {
+         mkdir -p "${initdir}/$systemdsystemunitdir/basic.target.wants"
+         for i in \
+                 iscsid.service \
++                iscsiuio.service \
+             ; do
+             ln_r "$systemdsystemunitdir/${i}" "$systemdsystemunitdir/basic.target.wants/${i}"
+         done
+-- 
+2.6.6
+
diff --git a/0225-95fcoe-do-not-start-fcoemon-twice.patch b/0225-95fcoe-do-not-start-fcoemon-twice.patch
new file mode 100644
index 0000000..353152c
--- /dev/null
+++ b/0225-95fcoe-do-not-start-fcoemon-twice.patch
@@ -0,0 +1,32 @@
+From 6e779051fd7ac96cf7db758df3ffe240ae3f8880 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Tue, 27 Sep 2016 16:38:36 +0200
+Subject: [PATCH] 95fcoe: do not start fcoemon twice
+
+With the latest changes to fcoe the fcoemon got started twice for
+bnx2 installations.
+
+References: bsc#1001512
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ modules.d/95fcoe/fcoe-up.sh | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
+index 102f9d3..74bdf81 100755
+--- a/modules.d/95fcoe/fcoe-up.sh
++++ b/modules.d/95fcoe/fcoe-up.sh
+@@ -57,9 +57,6 @@ if [ "$netdriver" = "bnx2x" ]; then
+     udevadm settle --timeout=30
+     # Sleep for 3 s to allow dcb negotiation
+     sleep 3
+-    write_fcoemon_cfg
+-    fcoemon --syslog=yes
+-    fipvlan -c -s "$netif"
+ elif [ "$dcb" = "dcb" ]; then
+     # wait for lldpad to be ready
+     i=0
+-- 
+2.6.6
+
diff --git a/0306-90multipath-add-shutdown-script.patch b/0306-90multipath-add-shutdown-script.patch
index 1362a8a..184bc60 100644
--- a/0306-90multipath-add-shutdown-script.patch
+++ b/0306-90multipath-add-shutdown-script.patch
@@ -55,7 +55,7 @@ index 214abd3..1d41bf8 100755
 -    need_shutdown
 -    break
 +for i in $(multipath -l -v1); do
-+    if $(dmsetup table $i | grep -q queue_if_no_path) ; then
++    if $(dmsetup table $i | sed -n '/.*queue_if_no_path.*/q1') ; then
 +        need_shutdown
 +        break
 +    fi
diff --git a/0307-90multipath-parse-kernel-commandline-option-multipat.patch b/0307-90multipath-parse-kernel-commandline-option-multipat.patch
new file mode 100644
index 0000000..ee5c319
--- /dev/null
+++ b/0307-90multipath-parse-kernel-commandline-option-multipat.patch
@@ -0,0 +1,30 @@
+From 8997862e7a72ee3322bc17002e321ec1969c1260 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Wed, 28 Sep 2016 15:29:52 +0200
+Subject: [PATCH] 90multipath: parse kernel commandline option 'multipath=off'
+
+SLES11 provided a kernel commandline option 'multipath=off',
+so dracut should be parsing the option, too.
+
+References: bsc#1001691
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ modules.d/90multipath/multipathd.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/90multipath/multipathd.service b/modules.d/90multipath/multipathd.service
+index 0f11bd5..ab42740 100644
+--- a/modules.d/90multipath/multipathd.service
++++ b/modules.d/90multipath/multipathd.service
+@@ -8,6 +8,7 @@ Conflicts=shutdown.target
+ ConditionKernelCommandLine=!nompath
+ ConditionKernelCommandLine=!rd.multipath=0
+ ConditionKernelCommandLine=!rd_NO_MULTIPATH
++ConditionKernelCommandLine=!multipath=off
+ 
+ [Service]
+ Type=simple
+-- 
+2.6.6
+
diff --git a/dracut-installkernel b/dracut-installkernel
index 0ced1e0..94b6690 100644
--- a/dracut-installkernel
+++ b/dracut-installkernel
@@ -28,8 +28,8 @@ case "$(uname -m)" in
         BOOTFILE=Image
         ;;
     armv*)
-        BOOTFILE=zImage
-        ;;
+	BOOTFILE=zImage
+	;;
     *)
         BOOTFILE=vmlinuz
         ;;
diff --git a/dracut.changes b/dracut.changes
index aa5795f..5646f7f 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,4 +1,55 @@
 -------------------------------------------------------------------
+Wed Sep 28 15:32:37 CEST 2016 - hare@suse.de
+
+- 90multipath: parse commandline option 'multipath=off' (bsc#1001691)
+  *add 0307-90multipath-parse-kernel-commandline-option-multipat.patch
+
+-------------------------------------------------------------------
+Wed Sep 28 08:31:38 CEST 2016 - hare@suse.de
+
+- 95fcoe: do not start fcoemon twice (bsc#1001512)
+  *add 0225-95fcoe-do-not-start-fcoemon-twice.patch
+
+-------------------------------------------------------------------
+Tue Sep 27 13:44:04 CEST 2016 - hare@suse.de
+
+- Reformat patch headers:
+  *modify 0199-rd-iscsi-waitnet-default-false.patch
+  *modify 0200-dracut_fix_multipath_without_config.patch
+  *modify 0210-add_fcoe_uefi_check.patch
+  *modify 0212-fcoe_reorder_init_path.patch
+- Rediff patches to apply cleanly:
+  *modify 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch
+  *modify 0133-Allow-multiple-configurations-per-network-interface-.patch
+  *modify 0170-iscsi-skip-ibft-invalid-dhcp.patch
+  *modify 0218-40network-allow-persistent-interface-names.patch
+- Remove spurious whitespaces:
+  *modify 0169-network_set_mtu_macaddr_for_dhcp.patch
+- 40network: print out correct prefix (bsc#996141)
+  *modify 0125-40network-separate-mask-and-prefix.patch
+- 95iscsi: setup bnx2i offload connection correctly (bsc#997598)
+  *add 0224-95iscsi-setup-bnx2i-offload-connections-properly.patch
+- Rename patches to match sequence number:
+  *old: 0019-40network-Fix-race-condition-when-wait-for-networks.patch
+  *new: 0012-40network-Fix-race-condition-when-wait-for-networks.patch
+  *old: 0066-40network-always-start-netroot-in-ifup.sh.patch
+  *new: 0013-40network-always-start-netroot-in-ifup.sh.patch
+
+-------------------------------------------------------------------
+Mon Sep 19 07:14:59 UTC 2016 - Thomas.Blume@suse.com
+
+- rd.iscsi.waitnet should default to false in order for dracut to
+  wait for the network devices (bsc#997598)
+  *add 0199-rd-iscsi-waitnet-default-false.patch
+
+-------------------------------------------------------------------
+Fri Sep 16 10:47:03 CEST 2016 - hare@suse.de
+
+- 95multipath: Replace 'grep' with 'sed' for shutdown scripts
+  (bsc#999220)
+  * modify 0306-90multipath-add-shutdown-script.patch
+
+------------------------------------------------------------------
 Thu Sep  1 17:11:17 UTC 2016 - opensuse@dstoecker.de
 
 - fix boot issues using RAID, bnc#970215
@@ -8,6 +59,8 @@ Wed Aug 31 19:06:19 UTC 2016 - trenn@suse.de
 
 - Add missing whitespace for md raid suse kernel param parsing (bsc#970215)
 *modify: 0059-99suse-Add-SUSE-specific-initrd-parsing.patch 
+- Fix IFS separater in net-lib.sh (bsc#996141)
+*modify: 0125-40network-separate-mask-and-prefix.patch
 
 -------------------------------------------------------------------
 Fri Aug 26 10:17:27 CEST 2016 - hare@suse.de
@@ -72,7 +125,7 @@ Tue Aug 23 13:36:18 CEST 2016 - hare@suse.de
 Fri Aug 19 10:09:30 CEST 2016 - hare@suse.de
 
 - Do not overwrite existing FCoE configuration (bsc#993861)
-  * Add 0214-95fcoe-Do-not-overwrite-FCoE-configuration.patch
+  * Add 0213-95fcoe-Do-not-overwrite-FCoE-configuration.patch
 
 -------------------------------------------------------------------
 Tue Aug  2 14:19:00 UTC 2016 - trenn@suse.de
diff --git a/dracut.spec b/dracut.spec
index 6e67228..df8a9f3 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -34,8 +34,8 @@ Source6:        dracut-installkernel
 Source7:        99-debug.conf
 
 #Network:
-Patch12:        0019-40network-Fix-race-condition-when-wait-for-networks.patch
-Patch13:        0066-40network-always-start-netroot-in-ifup.sh.patch
+Patch12:        0012-40network-Fix-race-condition-when-wait-for-networks.patch
+Patch13:        0013-40network-always-start-netroot-in-ifup.sh.patch
 Patch15:        0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch
 Patch17:        0017-45ifcfg-use-distro-specific-scripts.patch
 Patch48:        0048-40network-Only-enable-network-interfaces-if-explicit.patch
@@ -118,6 +118,7 @@ Patch193:       0193-95iscsi-Set-number-of-login-retries.patch
 Patch196:       0196-ibft-wait-for-session-on-all-paths.patch
 Patch197:       0197-95iscsi-Do-not-require-network-for-qla4xxx-flash-ses.patch
 Patch198:       0198-95iscsi-set-rd.iscsi.firmware-for-qla4xxx-sessions.patch
+Patch199:       0199-rd-iscsi-waitnet-default-false.patch
 
 # Submit mainline asap
 Patch128:       0128-90lvm-Install-dm-snapshot-module.patch
@@ -144,6 +145,8 @@ Patch220:       0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
 Patch221:       0221-95fcoe-Add-shutdown-script.patch
 Patch222:       0222-90dm-Fixup-shutdown-script.patch
 Patch223:       0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
+Patch224:       0224-95iscsi-setup-bnx2i-offload-connections-properly.patch
+Patch225:       0225-95fcoe-do-not-start-fcoemon-twice.patch
 
 # SUSE-specific fixes
 Patch300:       0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch
@@ -153,6 +156,7 @@ Patch303:       0303-fix_multipath_check_hostonly.patch
 Patch304:       0304-90multipath-Start-daemon-after-udev-settle.patch
 Patch305:       0305-90multipath-load-dm_multipath-module-during-startup.patch
 Patch306:       0306-90multipath-add-shutdown-script.patch
+Patch307:       0307-90multipath-parse-kernel-commandline-option-multipat.patch
 
 # New features/improvements
 Patch402:       0402-driver-fail-summary.patch
@@ -310,6 +314,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 %patch196 -p1
 %patch197 -p1
 %patch198 -p1
+%patch199 -p1
 
 %patch200 -p1
 %patch201 -p1
@@ -334,6 +339,8 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 %patch221 -p1
 %patch222 -p1
 %patch223 -p1
+%patch224 -p1
+%patch225 -p1
 
 %patch300 -p1
 %patch301 -p1
@@ -342,6 +349,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 %patch304 -p1
 %patch305 -p1
 %patch306 -p1
+%patch307 -p1
 
 %patch402 -p1
 %patch403 -p1

From d9c684105c4dfbfd7afe9b29d358e194a6f579fe7b40ef97ed9129a5eede6ba3 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Thu, 13 Oct 2016 13:03:19 +0000
Subject: [PATCH 2/2] Accepting request 434686 from
 home:hreinecke:branches:Base:System

- 95resume: Do not resume on iSCSI devices (bsc#999663)
  *add 0310-95resume-Do-not-resume-on-iSCSI.patch
- 95iscsi: ip=ibft is deprecated (bsc#1004437)
  *add 0311-95iscsi-ip-ibft-is-deprecated.patch
- 40network: do not print warning about non-existing file
  (bsc#1004437)
  *add 0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch

- 90dmraid: do not delete partitions (bsc#998860)
  *add 0309-90dmraid-do-not-delete-partitions.patch

- Give-persistent_policy-precedence-over-dev-mapper-names (bsc#908143)
  *add: 0502-persistent_device_policy_param_enhance.patch
- mdadm IMSM_NO_PLATFORM workaround for kdump (bsc#975404)
  *add: 0308-mdraid_add_IMSM_NO_PLATFORM_env.patch

OBS-URL: https://build.opensuse.org/request/show/434686
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=268
---
 0308-mdraid_add_IMSM_NO_PLATFORM_env.patch    | 12 ++++
 0309-90dmraid-do-not-delete-partitions.patch  | 33 +++++++++++
 0310-95resume-Do-not-resume-on-iSCSI.patch    | 36 ++++++++++++
 0311-95iscsi-ip-ibft-is-deprecated.patch      | 31 ++++++++++
 ...-print-message-about-tmp-net.ibft0.c.patch | 40 +++++++++++++
 ...rsistent_device_policy_param_enhance.patch | 58 +++++++++++++++++++
 dracut.changes                                | 25 ++++++++
 dracut.spec                                   | 12 ++++
 8 files changed, 247 insertions(+)
 create mode 100644 0308-mdraid_add_IMSM_NO_PLATFORM_env.patch
 create mode 100644 0309-90dmraid-do-not-delete-partitions.patch
 create mode 100644 0310-95resume-Do-not-resume-on-iSCSI.patch
 create mode 100644 0311-95iscsi-ip-ibft-is-deprecated.patch
 create mode 100644 0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch
 create mode 100644 0502-persistent_device_policy_param_enhance.patch

diff --git a/0308-mdraid_add_IMSM_NO_PLATFORM_env.patch b/0308-mdraid_add_IMSM_NO_PLATFORM_env.patch
new file mode 100644
index 0000000..31a818a
--- /dev/null
+++ b/0308-mdraid_add_IMSM_NO_PLATFORM_env.patch
@@ -0,0 +1,12 @@
+Index: dracut-044/modules.d/90mdraid/parse-md.sh
+===================================================================
+--- dracut-044.orig/modules.d/90mdraid/parse-md.sh	2015-11-25 14:22:28.000000000 +0100
++++ dracut-044/modules.d/90mdraid/parse-md.sh	2016-10-07 15:23:20.122868317 +0200
+@@ -19,6 +19,7 @@ else
+                     done;
+                     printf 'GOTO="md_end"\n'
+                     printf 'LABEL="md_uuid_ok"\n'
++                    printf 'ENV{IMSM_NO_PLATFORM}="1"'
+                 else
+                     echo "$line"
+                 fi
diff --git a/0309-90dmraid-do-not-delete-partitions.patch b/0309-90dmraid-do-not-delete-partitions.patch
new file mode 100644
index 0000000..32a5696
--- /dev/null
+++ b/0309-90dmraid-do-not-delete-partitions.patch
@@ -0,0 +1,33 @@
+From ec36a74a94d7d96670c25c89cffbbca1e964df0b Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Tue, 27 Sep 2016 16:38:36 +0200
+Subject: [PATCH] 90dmraid: do not delete partitions
+
+There is no point trying to delete partitions; dmraid works
+happily even with them. On the contrary trying to delete partitions
+can even be harmful when eg dmraid should _not_ be started.
+
+References: bsc#998860
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ modules.d/90dmraid/61-dmraid-imsm.rules | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/modules.d/90dmraid/61-dmraid-imsm.rules b/modules.d/90dmraid/61-dmraid-imsm.rules
+index 0193fbc..406cebd 100644
+--- a/modules.d/90dmraid/61-dmraid-imsm.rules
++++ b/modules.d/90dmraid/61-dmraid-imsm.rules
+@@ -21,9 +21,6 @@ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_end"
+ PROGRAM=="/bin/sh -c 'for i in $sys/$devpath/holders/dm-[0-9]*; do [ -e $$i ] && exit 0; done; exit 1;' ", \
+     GOTO="dm_end"
+ 
+-ENV{DEVTYPE}!="partition", \
+-    RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
+-
+ RUN+="/sbin/initqueue --onetime --unique --settled /sbin/dmraid_scan $env{DEVNAME}"
+ 
+ LABEL="dm_end"
+-- 
+2.6.6
+
diff --git a/0310-95resume-Do-not-resume-on-iSCSI.patch b/0310-95resume-Do-not-resume-on-iSCSI.patch
new file mode 100644
index 0000000..b7da34e
--- /dev/null
+++ b/0310-95resume-Do-not-resume-on-iSCSI.patch
@@ -0,0 +1,36 @@
+From 7cafbd9fe0f0799dc1a5c795d716e6732deb47ce Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Thu, 13 Oct 2016 09:58:32 +0200
+Subject: [PATCH 1/3] 95resume: Do not resume on iSCSI
+
+The iSCSI configuration is started after dracut checks for resume,
+so we run into a timeout here. Additionally it's questionable if
+resume on iSCSI makes sense (or is even supported on the platform),
+so disable it for now.
+
+References: bsc#999663
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ modules.d/95resume/module-setup.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
+index 7fe6df3..b11f8e8 100755
+--- a/modules.d/95resume/module-setup.sh
++++ b/modules.d/95resume/module-setup.sh
+@@ -2,6 +2,11 @@
+ 
+ # called by dracut
+ check() {
++    if dracut_module_included "iscsi" ; then
++        # Do not attempt resume on iscsi
++        return 255
++    fi
++
+     # No point trying to support resume, if no swap partition exist
+     [[ $hostonly ]] || [[ $mount_needs ]] && {
+         for fs in "${host_fs_types[@]}"; do
+-- 
+2.6.6
+
diff --git a/0311-95iscsi-ip-ibft-is-deprecated.patch b/0311-95iscsi-ip-ibft-is-deprecated.patch
new file mode 100644
index 0000000..d4a2520
--- /dev/null
+++ b/0311-95iscsi-ip-ibft-is-deprecated.patch
@@ -0,0 +1,31 @@
+From d6ad4e35af406a344fd1a1a3e872e941e7e59c86 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Thu, 13 Oct 2016 10:00:49 +0200
+Subject: [PATCH 2/3] 95iscsi: ip=ibft is deprecated
+
+Upstream deprecated 'ip=ibft', so update module-setup.sh to
+emit the correct command-line argument.
+
+References: bsc#1004437
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ modules.d/95iscsi/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
+index e272b24..d6521f0 100755
+--- a/modules.d/95iscsi/module-setup.sh
++++ b/modules.d/95iscsi/module-setup.sh
+@@ -61,7 +61,7 @@ install_ibft() {
+         fi
+         if [ -d ${d}/initiator ] ; then
+             if [ ${d##*/} = "ibft" ] && [ "$ibft_mod" != "bnx2i" ] ; then
+-                echo -n "ip=ibft "
++                echo -n "rd.iscsi.ibft=1 "
+             fi
+             echo -n "rd.iscsi.firmware=1"
+         fi
+-- 
+2.6.6
+
diff --git a/0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch b/0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch
new file mode 100644
index 0000000..fe54f81
--- /dev/null
+++ b/0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch
@@ -0,0 +1,40 @@
+From cc2bdf6b3bf0fcaa6597ee652c024027da24b501 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Thu, 13 Oct 2016 10:27:57 +0200
+Subject: [PATCH 3/3] 40network: Do not print message about /tmp/net.ibft0.conf
+ not found
+
+We need to check if the file /tmp/net.X.conf exists before trying
+to read from it; not doing so will create a warning during boot.
+
+References: bsc#1004437
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ modules.d/40network/ifup.sh | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index a4515d1..a684cba 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
+@@ -506,10 +506,12 @@ for p in $(getargs ip=); do
+     [ "$autoconf" = "ibft" ] && continue
+ 
+     # skip if same configuration appears twice
+-    while read line
+-    do
+-      [ "$line" = "$p" ] && continue 2
+-    done < /tmp/net.${netif}.conf
++    if [ -f /tmp/net.${netif}.conf ] ; then
++        while read line
++        do
++            [ "$line" = "$p" ] && continue 2
++        done < /tmp/net.${netif}.conf
++    fi
+ 
+     echo $p >> /tmp/net.${netif}.conf
+ 
+-- 
+2.6.6
+
diff --git a/0502-persistent_device_policy_param_enhance.patch b/0502-persistent_device_policy_param_enhance.patch
new file mode 100644
index 0000000..8c502bb
--- /dev/null
+++ b/0502-persistent_device_policy_param_enhance.patch
@@ -0,0 +1,58 @@
+From: Martin Wilck <mwilck@suse.de>
+Date: Wed, 5 Oct 2016 13:54:26 +0200
+Subject: [RFC/PATCH] Give --persistent_policy precedence over /dev/mapper names
+
+There is currently no way to override dracut's preference for
+/dev/mapper device names. But using these is problematic in
+different scenarios: For example, if a user has a multipath-
+enabled system but wants to disable multipath, or if the
+names of multipath maps change because of configuration changes
+(e.g. toggling user_friendly_names in /etc/multipath.conf).
+
+This patch makes dracut prefer the user-specified
+--persistent_policy names over /dev/mapper names.
+
+It might be worthwhile to discuss why dracut prefers /dev/mapper
+of /dev/disk/by-uuid at all. This preference was introduced
+in 9037b63e with the argument "dm devices maintain /dev/mapper/* as
+persistent names", but that's wrong for the scenarios mentioned
+above, and is not a compelling reason for preferring /dev/mapper
+over /dev/disk/by-uuid.
+
+References: bsc#908143
+
+Signed-off-by: Martin Wilck <mwilck@suse.de>
+---
+ dracut-functions.sh | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 249d8fb..e97765d 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -223,14 +223,20 @@ get_devpath_block() {
+ 
+ # get a persistent path from a device
+ get_persistent_dev() {
+-    local i _tmp _dev
++    local i _tmp _dev _pol
+ 
+     _dev=$(get_maj_min "$1")
+     [ -z "$_dev" ] && return
+ 
++    if [[ -n "$persistent_policy" ]]; then
++	_pol="/dev/disk/${persistent_policy}/*"
++    else
++	_pol=
++    fi
++
+     for i in \
++        $_pol \
+         /dev/mapper/* \
+-        /dev/disk/${persistent_policy:-by-uuid}/* \
+         /dev/disk/by-uuid/* \
+         /dev/disk/by-label/* \
+         /dev/disk/by-partuuid/* \
+-- 
+2.10.0
+
diff --git a/dracut.changes b/dracut.changes
index 5646f7f..1b7c92f 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Oct 13 10:33:56 CEST 2016 - hare@suse.de
+
+- 95resume: Do not resume on iSCSI devices (bsc#999663)
+  *add 0310-95resume-Do-not-resume-on-iSCSI.patch
+- 95iscsi: ip=ibft is deprecated (bsc#1004437)
+  *add 0311-95iscsi-ip-ibft-is-deprecated.patch
+- 40network: do not print warning about non-existing file
+  (bsc#1004437)
+  *add 0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch
+
+-------------------------------------------------------------------
+Mon Oct 10 10:44:17 CEST 2016 - hare@suse.de
+
+- 90dmraid: do not delete partitions (bsc#998860)
+  *add 0309-90dmraid-do-not-delete-partitions.patch
+
+-------------------------------------------------------------------
+Fri Oct  7 13:08:17 UTC 2016 - trenn@suse.de
+
+- Give-persistent_policy-precedence-over-dev-mapper-names (bsc#908143)
+  *add: 0502-persistent_device_policy_param_enhance.patch
+- mdadm IMSM_NO_PLATFORM workaround for kdump (bsc#975404)
+  *add: 0308-mdraid_add_IMSM_NO_PLATFORM_env.patch
+
 -------------------------------------------------------------------
 Wed Sep 28 15:32:37 CEST 2016 - hare@suse.de
 
diff --git a/dracut.spec b/dracut.spec
index df8a9f3..24ef149 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -157,6 +157,11 @@ Patch304:       0304-90multipath-Start-daemon-after-udev-settle.patch
 Patch305:       0305-90multipath-load-dm_multipath-module-during-startup.patch
 Patch306:       0306-90multipath-add-shutdown-script.patch
 Patch307:       0307-90multipath-parse-kernel-commandline-option-multipat.patch
+Patch308:       0308-mdraid_add_IMSM_NO_PLATFORM_env.patch
+Patch309:       0309-90dmraid-do-not-delete-partitions.patch
+Patch310:       0310-95resume-Do-not-resume-on-iSCSI.patch
+Patch311:       0311-95iscsi-ip-ibft-is-deprecated.patch
+Patch312:       0312-40network-Do-not-print-message-about-tmp-net.ibft0.c.patch
 
 # New features/improvements
 Patch402:       0402-driver-fail-summary.patch
@@ -166,6 +171,7 @@ Patch404:       0404-dracut-emergency-optionally-print-fs-help.patch
 # On top patches/fixes which have to be applied late
 Patch500:       0500-Reset-IFS-variable.patch
 Patch501:       0501-dasd_fix_ssid_bigger_zero.patch
+Patch502:       0502-persistent_device_policy_param_enhance.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  bash
@@ -350,6 +356,11 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 %patch305 -p1
 %patch306 -p1
 %patch307 -p1
+%patch308 -p1
+%patch309 -p1
+%patch310 -p1
+%patch311 -p1
+%patch312 -p1
 
 %patch402 -p1
 %patch403 -p1
@@ -357,6 +368,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 
 %patch500 -p1
 %patch501 -p1
+%patch502 -p1
 
 %build
 %configure\