From 36eb38017ea19fd4c274aa0b161c23668e246964 Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Wed, 7 Aug 2013 06:19:53 +0000 Subject: [PATCH 1/3] 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 From 14a06d8119e9719e3ce17c0226c3cf454925bf66 Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Wed, 14 Aug 2013 12:47:58 +0000 Subject: [PATCH 2/3] network: Do not output empty lines if no options defined. --- network/templates/hostname.if.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/templates/hostname.if.erb b/network/templates/hostname.if.erb index 3a02d91..55c0346 100644 --- a/network/templates/hostname.if.erb +++ b/network/templates/hostname.if.erb @@ -1,4 +1,4 @@ -<%= @options.join("\n") %> +<%= @options.join("\n") unless @options.empty? %> <% if @proto == 'dhcp' -%> dhcp NONE NONE NONE <% elsif @proto == 'none' -%> From 1f0880ceefdc42c505168544fd5305fe8045708d Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Wed, 30 Oct 2013 07:08:23 +0000 Subject: [PATCH 3/3] network, openbsd: Do not output unneccessary newlines when options not present. --- network/templates/hostname.if.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/network/templates/hostname.if.erb b/network/templates/hostname.if.erb index 55c0346..1cc3d52 100644 --- a/network/templates/hostname.if.erb +++ b/network/templates/hostname.if.erb @@ -1,5 +1,5 @@ -<%= @options.join("\n") unless @options.empty? %> -<% if @proto == 'dhcp' -%> +<%= @options.join("\n")+"\n" unless @options.empty? -%> +<% if @proto == 'dhcp' %> dhcp NONE NONE NONE <% elsif @proto == 'none' -%> up