2016-09-01 11:57:40 +00:00
|
|
|
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
|
2016-04-12 14:08:19 +00:00
|
|
|
@@ -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
|
2016-09-01 11:57:40 +00:00
|
|
|
--
|
|
|
|
|
2.6.6
|
|
|
|
|
|
