Blame 0009-network-ifup-do-not-ifup-an-already-setup-network-in.patch
|
Harald Hoyer |
bcb5fa |
From d61a423f7cb326848e952d9e13a8cbf25ca06631 Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
bcb5fa |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
bcb5fa |
Date: Tue, 4 Feb 2014 12:02:05 +0100
|
|
Harald Hoyer |
bcb5fa |
Subject: [PATCH] network/ifup: do not ifup an already setup network interface
|
|
Harald Hoyer |
bcb5fa |
|
|
Harald Hoyer |
bcb5fa |
---
|
|
Harald Hoyer |
bcb5fa |
modules.d/40network/ifup.sh | 6 +++++-
|
|
Harald Hoyer |
bcb5fa |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
Harald Hoyer |
bcb5fa |
|
|
Harald Hoyer |
bcb5fa |
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
|
Harald Hoyer |
bcb5fa |
index b33981b..3a03d05 100755
|
|
Harald Hoyer |
bcb5fa |
--- a/modules.d/40network/ifup.sh
|
|
Harald Hoyer |
bcb5fa |
+++ b/modules.d/40network/ifup.sh
|
|
Harald Hoyer |
bcb5fa |
@@ -80,7 +80,11 @@ fi
|
|
Harald Hoyer |
bcb5fa |
# in netroot case we prefer netroot to bringup $netif automaticlly
|
|
Harald Hoyer |
bcb5fa |
[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
|
|
Harald Hoyer |
bcb5fa |
[ -z "$netroot" ] && [ -z "$manualup" ] && exit 0
|
|
Harald Hoyer |
bcb5fa |
-[ -n "$manualup" ] && >/tmp/net.$netif.manualup
|
|
Harald Hoyer |
bcb5fa |
+if [ -n "$manualup" ]; then
|
|
Harald Hoyer |
bcb5fa |
+ >/tmp/net.$netif.manualup
|
|
Harald Hoyer |
bcb5fa |
+else
|
|
Harald Hoyer |
bcb5fa |
+ [ -f /tmp/net.${iface}.did-setup ] && exit 0
|
|
Harald Hoyer |
bcb5fa |
+fi
|
|
Harald Hoyer |
bcb5fa |
|
|
Harald Hoyer |
bcb5fa |
# Run dhclient
|
|
Harald Hoyer |
bcb5fa |
do_dhcp() {
|