diff options
| author | Olivier Blin <dev@blino.org> | 2012-03-23 23:51:24 +0100 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2012-03-24 00:03:23 +0100 |
| commit | 89432b418a1fba267bcec7e5440f50fb1d874b22 (patch) | |
| tree | 4fec08ad043e8eba876597690ef5700041af2a1f /sysconfig | |
| parent | 8f85566feeb57e8385c7e024cdde021e3f041bc2 (diff) | |
| download | initscripts-89432b418a1fba267bcec7e5440f50fb1d874b22.tar initscripts-89432b418a1fba267bcec7e5440f50fb1d874b22.tar.gz initscripts-89432b418a1fba267bcec7e5440f50fb1d874b22.tar.bz2 initscripts-89432b418a1fba267bcec7e5440f50fb1d874b22.tar.xz initscripts-89432b418a1fba267bcec7e5440f50fb1d874b22.zip | |
network: assume NetworkManager is used if NM_CONTROLLED is not set
Like done upstream in commit 300aaee62cd7a3166969e795b53b065c510e09c1
Diffstat (limited to 'sysconfig')
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 46789881..defe4baf 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -147,7 +147,7 @@ source_config () else ISALIAS=no fi - is_true $NM_CONTROLLED && USE_NM=true + ! is_false $NM_CONTROLLED && is_nm_running && USE_NM=true } ethtool_set() |