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

Merge pull request #8148 from mikefaille/netfixRHEL 

Revert "Fix `service network restart` on RHEL-7 / Fedora"
This commit is contained in:
Chris Roberts 2017-01-05 15:07:17 -08:00 committed by GitHub
parent 5bbe9c96ac 96611341a9
commit 5004f37a36
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 sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
} }
# Restart network (through NetworkManager if running) # Restart network
if service NetworkManager status 2>&1 | grep -q running; then service network restart
service NetworkManager restart
else
service network restart
fi
EOH EOH
end end
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 # Add the new interface and bring it back up
final_path = "#{network_scripts_dir}/ifcfg-#{network[:device]}" 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 # Down the interface before munging the config file. This might
# fail if the interface is not actually set up yet so ignore # fail if the interface is not actually set up yet so ignore
# errors. # errors.
@ -48,13 +48,9 @@ module VagrantPlugins
EOH EOH
end end
commands << <<-EOH.gsub(/^ {12}/, '') commands << <<-EOH.gsub(/^ */, '')
# Restart network (through NetworkManager if running) # Restart network
if service NetworkManager status 2>&1 | grep -q running; then service network restart
service NetworkManager restart
else
service network restart
fi
EOH EOH
comm.sudo(commands.join("\n")) comm.sudo(commands.join("\n"))