aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-02-16 14:06:16 -0500
committerBill Nottingham <notting@redhat.com>2010-03-01 16:03:36 -0500
commit7623065694b1b84bf99f2425ff91cf5655e4d981 (patch)
treeb5280d6cd3952ca06c2312d655eaf772056774dc /sysconfig/network-scripts
parent9c4b5b4c2f2105e99377719b78631b357dfc2e3d (diff)
downloadinitscripts-7623065694b1b84bf99f2425ff91cf5655e4d981.tar
initscripts-7623065694b1b84bf99f2425ff91cf5655e4d981.tar.gz
initscripts-7623065694b1b84bf99f2425ff91cf5655e4d981.tar.bz2
initscripts-7623065694b1b84bf99f2425ff91cf5655e4d981.tar.xz
initscripts-7623065694b1b84bf99f2425ff91cf5655e4d981.zip
Add a function that determines the status of NetworkManager; use it.
Diffstat (limited to 'sysconfig/network-scripts')
-rw-r--r--sysconfig/network-scripts/network-functions6
1 files changed, 6 insertions, 0 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 96df715b..313e42fd 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -138,6 +138,7 @@ source_config ()
else
ISALIAS=no
fi
+ is_nm_running && USE_NM=true
}
@@ -190,6 +191,11 @@ do_netreport ()
)
}
+is_nm_running ()
+{
+ LANG=C nmcli nm status | grep -Eq "NM running:[[:space:]]+running"
+}
+
# Sets $alias to the device module if $? != 0
is_available ()
{
> * tag 10.4.130Thierry Vignaud2007-05-161-0/+2 * bump version (10.4.130) for toolsThierry Vignaud2007-05-161-1/+1 * Japanese translation reviewedYukiko Bando2007-05-151-8/+8 * small fix on previous commitPascal Rigaux2007-05-151-1/+2 * - bootloader-config:Pascal Rigaux2007-05-152-2/+27 * use "mkfs.ext3" instead of "mkfs.ext2 -J"Pascal Rigaux2007-05-144-2/+9 * re-sync after the big svn lossPascal Rigaux2007-05-142-0/+0 * re-sync after the big svn lossPascal Rigaux2007-05-14142-0/+0 * - do not ask for updates at end of installation when updates are alreadyPascal Rigaux2007-05-092-0/+8 * - localedrake:Pascal Rigaux2007-05-092-1/+3 * upJosé Melo2007-05-071-56/+9 * upJosé Melo2007-05-071-92/+60 * upJosé Melo2007-05-071-41/+15 * create udev nodes configuration file in /etc/udev/devices.d/ instead of conf....Olivier Blin2007-04-302-3/+4 * do not try to configure dvd devices during install since /dev is wiped out at...Olivier Blin2007-04-304-17/+2 * use ->last_usable_sector instead of {totalsectors} so that resizing aPascal Rigaux2007-04-301-1/+1 * "Free space" is better than "Empty space"Pascal Rigaux2007-04-291-1/+1 * - allow umounting cdrom during a transactionPascal Rigaux2007-04-272-0/+2 * re-sync after the big svn lossPascal Rigaux2007-04-251-715/+100 * re-sync after the big svn lossPascal Rigaux2007-04-25