From 36eb38017ea19fd4c274aa0b161c23668e246964 Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Wed, 7 Aug 2013 06:19:53 +0000 Subject: [PATCH] network: Move options in OpenBSD to top of /etc/hostname.if so device can be created before using it, etc. --- network/templates/hostname.if.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/network/templates/hostname.if.erb b/network/templates/hostname.if.erb index ccf7b9d..3a02d91 100644 --- a/network/templates/hostname.if.erb +++ b/network/templates/hostname.if.erb @@ -1,9 +1,10 @@ +<%= @options.join("\n") %> <% if @proto == 'dhcp' -%> -dhcp NONE NONE NONE<% @options.each do |val| %> <%= val %><% end %> +dhcp NONE NONE NONE <% elsif @proto == 'none' -%> up <% else -%> -inet <%= @ipaddr %> <%= @netmask %> NONE<% @options.each do |val| %> <%= val %><% end %> +inet <%= @ipaddr %> <%= @netmask %> NONE <% end -%> <% if @ip6addr == 'auto' -%> rtsol