aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-02-16 15:17:03 -0500
committerBill Nottingham <notting@redhat.com>2010-03-01 16:03:36 -0500
commitc43e3361caca18a78e58fca3db57ce513d18d694 (patch)
tree8053e9ce216da980758aa1853eac6b00340406d9 /sysconfig/network-scripts
parent7623065694b1b84bf99f2425ff91cf5655e4d981 (diff)
downloadinitscripts-c43e3361caca18a78e58fca3db57ce513d18d694.tar
initscripts-c43e3361caca18a78e58fca3db57ce513d18d694.tar.gz
initscripts-c43e3361caca18a78e58fca3db57ce513d18d694.tar.bz2
initscripts-c43e3361caca18a78e58fca3db57ce513d18d694.tar.xz
initscripts-c43e3361caca18a78e58fca3db57ce513d18d694.zip
Use NM if it's running and we have a configuration for the device.
Diffstat (limited to 'sysconfig/network-scripts')
-rwxr-xr-xsysconfig/network-scripts/ifdown9
-rwxr-xr-xsysconfig/network-scripts/ifup9
-rw-r--r--sysconfig/network-scripts/network-functions4
3 files changed, 22 insertions, 0 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index a0cc0c9e..9c9112cb 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -41,6 +41,15 @@ then
exit 0
fi
+if [ "$USE_NM" = "true" -a -n "$NAME" -o -n "$UUID" ]; then
+ if [ -n "$UUID" ]; then
+ nmcli con down uuid "$UUID"
+ elif [ -n "$NAME" ]; then
+ nmcli con down id "$NAME"
+ fi
+ exit $?
+fi
+
if [ -x /sbin/ifdown-pre-local ]; then
/sbin/ifdown-pre-local ${DEVICE}
fi
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index e3b01478..5d50cbfc 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -65,6 +65,15 @@ then
exit 0
fi
+if [ "$USE_NM" = "true" -a -n "$NAME" -o -n "$UUID" ]; then
+ if [ -n "$UUID" ]; then
+ nmcli con up uuid "$UUID"
+ elif [ -n "$NAME" ]; then
+ nmcli con up id "$NAME"
+ fi
+ exit $?
+fi
+
# Ethernet 802.1Q VLAN support
if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ] && [ -x /sbin/vconfig ]; then
VID=""
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 313e42fd..0eaf8e10 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -139,6 +139,10 @@ source_config ()
ISALIAS=no
fi
is_nm_running && USE_NM=true
+ if [ -z "$NAME" -a "$USE_NM" = "true" ]; then
+ UUID=$(nmcli -t con list id "System ${DEVICE}" 2>/dev/null| awk '/uuid :/ { print $3 }')
+ [ -n "$UUID" ] && NAME="System ${DEVICE}"
+ fi
}