Blame 0126-network-ifup.sh-do_static-error-out-if-interface-cou.patch
|
Harald Hoyer |
bb31e7 |
From 5193198dc9caabedfdd801a94bf936c69758aa14 Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
bb31e7 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
bb31e7 |
Date: Wed, 19 Aug 2015 13:59:40 +0200
|
|
Harald Hoyer |
bb31e7 |
Subject: [PATCH] network/ifup.sh:do_static(): error out, if interface could
|
|
Harald Hoyer |
bb31e7 |
not be brought up
|
|
Harald Hoyer |
bb31e7 |
|
|
Harald Hoyer |
bb31e7 |
(cherry picked from commit 77f46adf5e5ab1f6da2e459bb55435d4b70842c5)
|
|
Harald Hoyer |
bb31e7 |
---
|
|
Harald Hoyer |
bb31e7 |
modules.d/40network/ifup.sh | 6 +++++-
|
|
Harald Hoyer |
bb31e7 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
Harald Hoyer |
bb31e7 |
|
|
Harald Hoyer |
bb31e7 |
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
|
Harald Hoyer |
bb31e7 |
index 7da9171..69a4567 100755
|
|
Harald Hoyer |
bb31e7 |
--- a/modules.d/40network/ifup.sh
|
|
Harald Hoyer |
bb31e7 |
+++ b/modules.d/40network/ifup.sh
|
|
Harald Hoyer |
bb31e7 |
@@ -150,7 +150,11 @@ do_ipv6auto() {
|
|
Harald Hoyer |
bb31e7 |
do_static() {
|
|
Harald Hoyer |
bb31e7 |
strglobin $ip '*:*:*' && load_ipv6
|
|
Harald Hoyer |
bb31e7 |
|
|
Harald Hoyer |
bb31e7 |
- linkup $netif
|
|
Harald Hoyer |
bb31e7 |
+ if ! linkup $netif; then
|
|
Harald Hoyer |
bb31e7 |
+ warn "Could bring interface $netif up!"
|
|
Harald Hoyer |
bb31e7 |
+ return 1
|
|
Harald Hoyer |
bb31e7 |
+ fi
|
|
Harald Hoyer |
bb31e7 |
+
|
|
Harald Hoyer |
bb31e7 |
[ -n "$macaddr" ] && ip link set address $macaddr dev $netif
|
|
Harald Hoyer |
bb31e7 |
[ -n "$mtu" ] && ip link set mtu $mtu dev $netif
|
|
Harald Hoyer |
bb31e7 |
if strglobin $ip '*:*:*'; then
|