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

Disable (if/net)plugd on gentoo/openrc. Fixes #9260. 

When ifplugd is installed, the process is backgrounded and we get the
wrong return value.
This commit is contained in:
Jan Vansteenkiste 2017-12-12 18:32:09 +01:00
parent 180a82c6eb
commit e5bebb0b9f
No known key found for this signature in database
GPG Key ID: 7F4AE8F1CC71B52B
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/guests/gentoo/network_static.erb
View File

@ -1,6 +1,7 @@
#VAGRANT-BEGIN #VAGRANT-BEGIN
# The contents below are automatically generated by Vagrant. Do not modify. # The contents below are automatically generated by Vagrant. Do not modify.
config_<%= options[:device] %>=("<%= options[:ip] %> netmask <%= options[:netmask] %>") config_<%= options[:device] %>=("<%= options[:ip] %> netmask <%= options[:netmask] %>")
modules_<%= options[:device] %>=("!plug")
<% if options[:gateway] -%> <% if options[:gateway] -%>
gateways_<%= options[:device] %>="<%= options[:gateway] %>" gateways_<%= options[:device] %>="<%= options[:gateway] %>"
<% end -%> <% end -%>

1
templates/guests/gentoo/network_static6.erb
View File

@ -1,6 +1,7 @@
#VAGRANT-BEGIN #VAGRANT-BEGIN
# The contents below are automatically generated by Vagrant. Do not modify. # The contents below are automatically generated by Vagrant. Do not modify.
config_<%= options[:device] %>="<%= options[:ip] %>/<%= options[:netmask] %>" config_<%= options[:device] %>="<%= options[:ip] %>/<%= options[:netmask] %>"
modules_<%= options[:device] %>="!plug"
<% if options[:gateway] -%> <% if options[:gateway] -%>
gateways_<%= options[:device] %>="<%= options[:gateway] %>" gateways_<%= options[:device] %>="<%= options[:gateway] %>"
<% end -%> <% end -%>

2
test/unit/templates/guests/gentoo/network_static_test.rb
View File

@ -15,6 +15,7 @@ describe "templates/guests/gentoo/network_static" do
#VAGRANT-BEGIN #VAGRANT-BEGIN
# The contents below are automatically generated by Vagrant. Do not modify. # The contents below are automatically generated by Vagrant. Do not modify.
config_en0=("1.1.1.1 netmask 255.255.0.0") config_en0=("1.1.1.1 netmask 255.255.0.0")
modules_en0=("!plug")
#VAGRANT-END #VAGRANT-END
EOH EOH
end end
@ -30,6 +31,7 @@ describe "templates/guests/gentoo/network_static" do
#VAGRANT-BEGIN #VAGRANT-BEGIN
# The contents below are automatically generated by Vagrant. Do not modify. # The contents below are automatically generated by Vagrant. Do not modify.
config_en0=("1.1.1.1 netmask 255.255.0.0") config_en0=("1.1.1.1 netmask 255.255.0.0")
modules_en0=("!plug")
gateways_en0="1.2.3.4" gateways_en0="1.2.3.4"
#VAGRANT-END #VAGRANT-END
EOH EOH