36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From ede0532c580fdbace548511b07857fb2e004b299 Mon Sep 17 00:00:00 2001
|
|
From: Harald Hoyer <harald@redhat.com>
|
|
Date: Tue, 29 May 2012 16:34:58 +0200
|
|
Subject: [PATCH] network/ifup.sh: do not default to dhcp, for interfaces
|
|
without ip=...
|
|
|
|
Don't try to be smarter than the admin configuring the machine.
|
|
Does also conflict with other methods trying to setup the interfaces,
|
|
like cmsifup.sh from the cms module.
|
|
---
|
|
modules.d/40network/ifup.sh | 11 -----------
|
|
1 file changed, 11 deletions(-)
|
|
|
|
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
|
index c9516bb..f785968 100755
|
|
--- a/modules.d/40network/ifup.sh
|
|
+++ b/modules.d/40network/ifup.sh
|
|
@@ -213,17 +213,6 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then
|
|
ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname; echo $?)"
|
|
fi
|
|
|
|
-# No ip lines default to dhcp
|
|
-ip=$(getarg ip)
|
|
-
|
|
-if [ -z "$ip" ]; then
|
|
- if [ "$netroot" = "dhcp6" ]; then
|
|
- do_dhcp -6
|
|
- else
|
|
- do_dhcp -4
|
|
- fi
|
|
-fi
|
|
-
|
|
# Specific configuration, spin through the kernel command line
|
|
# looking for ip= lines
|
|
for p in $(getargs ip=); do
|