diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-02-27 11:06:00 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-07-31 21:39:39 +0100 |
| commit | b5546e711fd7b59f2169c1045290e4bab6df4d02 (patch) | |
| tree | 0dc7d391d9a593262649ae4b7173581110e94171 | |
| parent | e27657c855f51d46623d1a4842c9f6ff3b6c2f00 (diff) | |
| download | initscripts-distro/mga3.tar initscripts-distro/mga3.tar.gz initscripts-distro/mga3.tar.bz2 initscripts-distro/mga3.tar.xz initscripts-distro/mga3.zip | |
Bail early if NetworkManager is used.distro/mga3
Our initscripts vary quite different from Fedoras in that we will
actively start a wpa_supplicant daemon for wireless interfaces
As this can cause problems if the NM detection code is flaky
(which it is) we really do want to bail early when this is the case
https://bugs.mageia.org/show_bug.cgi?id=9028
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 10 |
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 |