haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Fix `service network restart` on RHEL-7 / Fedora" 

`/etc/init.d/network restart` already restart NM and shutdown interfaces.

In start() :
```
        if [ "$(LANG=C nmcli -t --fields running general status 2>/dev/null)" = "running" ]; then
                nmcli connection reload
        fi

```

In stop() :

```
       for i in $vpninterfaces $xdslinterfaces $bridgeinterfaces $vlaninterfaces $remaining; do
                unset DEVICE TYPE
                (. ./ifcfg-$i
                if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi

                if ! check_device_down $DEVICE; then
                   action $"Shutting down interface $i: " ./ifdown $i boot
                   [ $? -ne 0 ] && rc=1
                fi
                )
        done
```
Where $remaining include all "others" interfaces including eth*

This reverts commit 166d10d4e1.
This commit is contained in:
Michaël Faille 2016-12-21 20:31:53 -05:00
parent a3b9d231ad
commit 96611341a9
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/guests/redhat/cap/change_host_name.rb
View File

@ -31,12 +31,8 @@ module VagrantPlugins
sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
}
# Restart network (through NetworkManager if running)
if service NetworkManager status 2>&1 | grep -q running; then
service NetworkManager restart
else
service network restart
fi
# Restart network
service network restart
EOH
end
end

12
plugins/guests/redhat/cap/configure_networks.rb
View File

@ -36,7 +36,7 @@ module VagrantPlugins
# Add the new interface and bring it back up
final_path = "#{network_scripts_dir}/ifcfg-#{network[:device]}"
commands << <<-EOH.gsub(/^ {14}/, '')
commands << <<-EOH.gsub(/^ */, '')
# Down the interface before munging the config file. This might
# fail if the interface is not actually set up yet so ignore
# errors.
@ -48,13 +48,9 @@ module VagrantPlugins
EOH
end
commands << <<-EOH.gsub(/^ {12}/, '')
# Restart network (through NetworkManager if running)
if service NetworkManager status 2>&1 | grep -q running; then
service NetworkManager restart
else
service network restart
fi
commands << <<-EOH.gsub(/^ */, '')
# Restart network
service network restart
EOH
comm.sudo(commands.join("\n"))