aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2012-04-30 14:03:50 -0400
committerBill Nottingham <notting@redhat.com>2012-04-30 14:03:50 -0400
commitd1256a2ab6187b2c8696b25697f41a87c736de1b (patch)
treef8a6bb685664cabb798f752bf23c8d58fdfbbcf1 /sysconfig
parentaac197e7dee0139dc0bb8d1ba4f5345ec5e9188b (diff)
downloadinitscripts-d1256a2ab6187b2c8696b25697f41a87c736de1b.tar
initscripts-d1256a2ab6187b2c8696b25697f41a87c736de1b.tar.gz
initscripts-d1256a2ab6187b2c8696b25697f41a87c736de1b.tar.bz2
initscripts-d1256a2ab6187b2c8696b25697f41a87c736de1b.tar.xz
initscripts-d1256a2ab6187b2c8696b25697f41a87c736de1b.zip
Rename internal tracking variable USE_NM to _use_nm, to more clearly state it's not for configuration use.
Diffstat (limited to 'sysconfig')
-rwxr-xr-xsysconfig/network-scripts/ifdown2
-rwxr-xr-xsysconfig/network-scripts/ifup2
-rw-r--r--sysconfig/network-scripts/network-functions4
3 files changed, 4 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 70f54720..6bd1073d 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -41,7 +41,7 @@ then
exit 0
fi
-if [ "$USE_NM" = "true" ]; then
+if [ "$_use_nm" = "true" ]; then
if [ -n "$UUID" -a -z "$DEVICE" ]; then
DEVICE=$(nmcli -t --fields uuid,devices con status | awk -F ':' "\$1 == \"$UUID\" { print \$2 }")
fi
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index f5ac0fe0..6534f5a1 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -65,7 +65,7 @@ then
exit 0
fi
-if [ "$USE_NM" = "true" -a -n "$UUID" ]; then
+if [ "$_use_nm" = "true" -a -n "$UUID" ]; then
nmcli con up uuid "$UUID"
exit $?
fi
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 044f1ea1..89d5da5a 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -167,8 +167,8 @@ source_config ()
else
ISALIAS=no
fi
- ! is_false $NM_CONTROLLED && is_nm_running && USE_NM=true
- if [ -z "$UUID" -a "$USE_NM" = "true" ]; then
+ ! is_false $NM_CONTROLLED && is_nm_running && _use_nm=true
+ if [ -z "$UUID" -a "$_use_nm" = "true" ]; then
UUID=$(get_uuid_by_config $CONFIG)
fi
}