From b89e593070b3f36d7b65739773348bfbc378a6c1 Mon Sep 17 00:00:00 2001 From: Seth Chisamore Date: Sun, 7 Apr 2013 15:47:21 -0400 Subject: [PATCH 1/2] ensure static network changes don't update DNS `PEERDNS=no` ensures the DNS settings (from /etc/resolv.conf) are not overwritten when we do an ifdown/ifup cycle to apply Vagrant's changes. --- templates/guests/redhat/network_static.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/guests/redhat/network_static.erb b/templates/guests/redhat/network_static.erb index acff23abc..1e3baa57f 100644 --- a/templates/guests/redhat/network_static.erb +++ b/templates/guests/redhat/network_static.erb @@ -4,4 +4,5 @@ BOOTPROTO=static IPADDR=<%= options[:ip] %> NETMASK=<%= options[:netmask] %> DEVICE=eth<%= options[:interface] %> +PEERDNS=no #VAGRANT-END From 7ed406629b38ecbb90ff29d57083e41ed5d508d0 Mon Sep 17 00:00:00 2001 From: Seth Chisamore Date: Sun, 7 Apr 2013 15:45:36 -0400 Subject: [PATCH 2/2] `static` is not a valid BOOTPROTO value Valid BOOTPROTO choices include: `none`, `bootp` and `dhcp`. In the case of static network addresses `none` should be used. --- templates/guests/fedora/network_static.erb | 2 +- templates/guests/redhat/network_static.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/guests/fedora/network_static.erb b/templates/guests/fedora/network_static.erb index aa7e20d5d..327fa46f8 100644 --- a/templates/guests/fedora/network_static.erb +++ b/templates/guests/fedora/network_static.erb @@ -1,7 +1,7 @@ #VAGRANT-BEGIN # The contents below are automatically generated by Vagrant. Do not modify. NM_CONTROLLED=no -BOOTPROTO=static +BOOTPROTO=none ONBOOT=yes IPADDR=<%= options[:ip] %> NETMASK=<%= options[:netmask] %> diff --git a/templates/guests/redhat/network_static.erb b/templates/guests/redhat/network_static.erb index 1e3baa57f..f403a7068 100644 --- a/templates/guests/redhat/network_static.erb +++ b/templates/guests/redhat/network_static.erb @@ -1,6 +1,6 @@ #VAGRANT-BEGIN # The contents below are automatically generated by Vagrant. Do not modify. -BOOTPROTO=static +BOOTPROTO=none IPADDR=<%= options[:ip] %> NETMASK=<%= options[:netmask] %> DEVICE=eth<%= options[:interface] %>