From e5bebb0b9fa781df22518641bf26f8c971a9783f Mon Sep 17 00:00:00 2001 From: Jan Vansteenkiste Date: Tue, 12 Dec 2017 18:32:09 +0100 Subject: [PATCH] Disable (if/net)plugd on gentoo/openrc. Fixes #9260. When ifplugd is installed, the process is backgrounded and we get the wrong return value. --- templates/guests/gentoo/network_static.erb | 1 + templates/guests/gentoo/network_static6.erb | 1 + test/unit/templates/guests/gentoo/network_static_test.rb | 2 ++ 3 files changed, 4 insertions(+) diff --git a/templates/guests/gentoo/network_static.erb b/templates/guests/gentoo/network_static.erb index ed68c911d..26424166a 100644 --- a/templates/guests/gentoo/network_static.erb +++ b/templates/guests/gentoo/network_static.erb @@ -1,6 +1,7 @@ #VAGRANT-BEGIN # The contents below are automatically generated by Vagrant. Do not modify. config_<%= options[:device] %>=("<%= options[:ip] %> netmask <%= options[:netmask] %>") +modules_<%= options[:device] %>=("!plug") <% if options[:gateway] -%> gateways_<%= options[:device] %>="<%= options[:gateway] %>" <% end -%> diff --git a/templates/guests/gentoo/network_static6.erb b/templates/guests/gentoo/network_static6.erb index 6467a57cd..3869ec4a8 100644 --- a/templates/guests/gentoo/network_static6.erb +++ b/templates/guests/gentoo/network_static6.erb @@ -1,6 +1,7 @@ #VAGRANT-BEGIN # The contents below are automatically generated by Vagrant. Do not modify. config_<%= options[:device] %>="<%= options[:ip] %>/<%= options[:netmask] %>" +modules_<%= options[:device] %>="!plug" <% if options[:gateway] -%> gateways_<%= options[:device] %>="<%= options[:gateway] %>" <% end -%> diff --git a/test/unit/templates/guests/gentoo/network_static_test.rb b/test/unit/templates/guests/gentoo/network_static_test.rb index 74c394480..33337065e 100644 --- a/test/unit/templates/guests/gentoo/network_static_test.rb +++ b/test/unit/templates/guests/gentoo/network_static_test.rb @@ -15,6 +15,7 @@ describe "templates/guests/gentoo/network_static" do #VAGRANT-BEGIN # The contents below are automatically generated by Vagrant. Do not modify. config_en0=("1.1.1.1 netmask 255.255.0.0") + modules_en0=("!plug") #VAGRANT-END EOH end @@ -30,6 +31,7 @@ describe "templates/guests/gentoo/network_static" do #VAGRANT-BEGIN # The contents below are automatically generated by Vagrant. Do not modify. config_en0=("1.1.1.1 netmask 255.255.0.0") + modules_en0=("!plug") gateways_en0="1.2.3.4" #VAGRANT-END EOH