diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2016-06-16 13:58:15 +0200 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2016-06-16 14:01:34 +0200 |
| commit | 6aa22f033aebbcca27c05d7a7138ad941220de0e (patch) | |
| tree | 9ad5cd730b8c3a2072d70060790144ee4a157f55 | |
| parent | c2b927943676bcf71e3ff0ff8acc2551d7988a37 (diff) | |
| download | initscripts-6aa22f033aebbcca27c05d7a7138ad941220de0e.tar initscripts-6aa22f033aebbcca27c05d7a7138ad941220de0e.tar.gz initscripts-6aa22f033aebbcca27c05d7a7138ad941220de0e.tar.bz2 initscripts-6aa22f033aebbcca27c05d7a7138ad941220de0e.tar.xz initscripts-6aa22f033aebbcca27c05d7a7138ad941220de0e.zip | |
ifup: don't call nmcli on any lo device
Resolves: #1336869
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 2 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 2b826e2d..f1678eb3 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" -a "$DEVICE" != "lo" ]; then +if [ "$_use_nm" = "true" -a -n "$UUID" -a "$REALDEVICE" != "lo" ]; then if [ "foo$2" = "fooboot" ] && [ "${TYPE}" = "Wireless" ]; then exit 0 fi diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index db729cc6..9cca9824 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -170,7 +170,7 @@ source_config () else ISALIAS=no fi - if is_nm_running; then + if is_nm_running && [ "$REALDEVICE" != "lo" ] ; then nmcli con load "/etc/sysconfig/network-scripts/$CONFIG" if ! is_false $NM_CONTROLLED; then UUID=$(get_uuid_by_config $CONFIG) |