dracut/0170-iscsi-skip-ibft-invalid-dhcp.patch

Index: dracut-044/modules.d/40network/net-lib.sh
===================================================================
--- dracut-044.orig/modules.d/40network/net-lib.sh	2016-04-11 17:44:20.892837133 +0200
+++ dracut-044/modules.d/40network/net-lib.sh	2016-04-11 17:44:21.292859774 +0200
@@ -287,7 +287,7 @@ ibft_to_cmdline() {
                         ;;
                 esac
             fi
-            if [ -n "$dhcp" ] || [ "$origin" -eq 3 ]; then
+            if [ -n "$dhcp" -a "$dhcp" != "0.0.0.0" ] || [ -z "$dhcp" -a "$origin" -eq 3 ]; then
                 if [ "$family" = "ipv6" ] ; then
                     echo "ip=$dev:dhcp6"
                 else
- Forward port of latest SLES patches (fate#320499) Add: * 0170-iscsi-skip-ibft-invalid-dhcp.patch * 0160-s390-update_active_devices_initrd.patch * 0161-95zfcp_rules-simplified-rd.zfcp-commandline-for-NPIV.patch * 0190-replace-iscsistart-with-systemd-service-files.patch * 0191-static_network_setup_return_zero.patch * 0192-iscsi_set_boot_protocol_from_ifcfg.patch * 0193-95iscsi-Set-number-of-login-retries.patch * 0403-95lunmask-Add-module-to-handle-LUN-masking.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=256 2016-04-12 14:08:19 +00:00			`Index: dracut-044/modules.d/40network/net-lib.sh`
			`===================================================================`
			`--- dracut-044.orig/modules.d/40network/net-lib.sh 2016-04-11 17:44:20.892837133 +0200`
			`+++ dracut-044/modules.d/40network/net-lib.sh 2016-04-11 17:44:21.292859774 +0200`
			`@@ -287,7 +287,7 @@ ibft_to_cmdline() {`
			`;;`
			`esac`
			`fi`
			`- if [ -n "$dhcp" ] \|\| [ "$origin" -eq 3 ]; then`
			`+ if [ -n "$dhcp" -a "$dhcp" != "0.0.0.0" ] \|\| [ -z "$dhcp" -a "$origin" -eq 3 ]; then`
			`if [ "$family" = "ipv6" ] ; then`
			`echo "ip=$dev:dhcp6"`
			`else`