aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsysconfig/network-scripts/ifdown2
-rwxr-xr-xsysconfig/network-scripts/ifup10
2 files changed, 9 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 597802bf..34a10c53 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -49,6 +49,8 @@ if [ "$_use_nm" = "true" ]; then
nmcli dev disconnect iface "$DEVICE"
exit $?
fi
+ echo $"$0: interface ${CONFIG} is controlled by NetworkManager; skipping." >&2
+ exit 0
fi
if [ -x /sbin/ifdown-pre-local ]; then
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 0e69b72a..18dad676 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -68,9 +68,13 @@ then
exit 0
fi
-if [ "$_use_nm" = "true" -a -n "$UUID" ]; then
- nmcli con up uuid "$UUID"
- exit $?
+if [ "$_use_nm" = "true" ]; then
+ if [ -n "$UUID" ]; then
+ nmcli con up uuid "$UUID"
+ exit $?
+ fi
+ echo $"$0: interface ${CONFIG} is controlled by NetworkManager; skipping." >&2
+ exit 0
fi
# Ethernet 802.1Q VLAN support