Marcus Meissner
0f203926a1
- Rename patch:
* From 0211-fix_multipath_check_hostonly.patch
to 0303-fix_multipath_check_hostonly.patch
- Rename patch:
* From 0213-10i18n-keymap-find.patch
to 0213-Fix-wrong-keymap-inclusion.patch
- 95fcoe: Do not complain about missing /etc/hba.conf (bsc#980539)
* Add 0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch
- 95fcoe: silence lldpad warnings
* Add 0216-95fcoe-silence-lldpad-warnings.patch
- 95fcoe: Allow to specify the FCoE mode via the fcoe= parameter
* Add 0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch
- 40network: allow persistent interface names (bsc#995284)
* Add 0218-40network-allow-persistent-interface-names.patch
- 95fcoe: use interface names instead of MAC addresses
* Add 0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch
- 95fcoe: always set AUTO_VLAN for fcoemon (bsc#995019)
* Add 0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
- 95fcoe: Add shutdown script (bsc#994860)
* Add 0221-95fcoe-Add-shutdown-script.patch
- 90dm: Fixup shutdown script (bsc#994860)
* Add 0222-90dm-Fixup-shutdown-script.patch
- 90dm: fixup dependency cycle between MD and DM shutdown (bsc#994860)
* Add 0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
- 90multipath: Start daemon after udev settle (bsc#986734)
* Add 0304-90multipath-Start-daemon-after-udev-settle.patch
- 90multipath: load dm_multipath module during startup
* Add 0305-90multipath-load-dm_multipath-module-during-startup.patch
- 90multipath: add shutdown script (bsc#994860)
OBS-URL: https://build.opensuse.org/request/show/422869
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=263
29 lines
940 B
Diff
29 lines
940 B
Diff
From e5d14a8adbfc875517e5d873bea18bf9d997b91f Mon Sep 17 00:00:00 2001
|
|
From: Thomas Renninger <trenn@suse.com>
|
|
Date: Tue, 23 Aug 2016 12:30:21 +0200
|
|
Subject: 40network: fixup invalid DHCP setting for iBFT
|
|
|
|
References: bsc#953361
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.com>
|
|
---
|
|
modules.d/40network/net-lib.sh | 2 +-
|
|
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
|
|
--- a/modules.d/40network/net-lib.sh
|
|
+++ b/modules.d/40network/net-lib.sh
|
|
@@ -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
|
|
--
|
|
2.6.6
|
|
|