From 79c189a4f381550259ffb73779a5ce079f15a22b Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 6 Nov 2013 12:04:05 +0200
Subject: [PATCH] network: Remove unnecessary newline and options from
 hostname.if.erb

---
 network/templates/hostname.if.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/network/templates/hostname.if.erb b/network/templates/hostname.if.erb
index 1cc3d52..8c72acd 100644
--- a/network/templates/hostname.if.erb
+++ b/network/templates/hostname.if.erb
@@ -1,10 +1,10 @@
 <%= @options.join("\n")+"\n" unless @options.empty? -%>
-<% if @proto == 'dhcp' %>
-dhcp NONE NONE NONE
+<% if @proto == 'dhcp' -%>
+dhcp
 <% elsif @proto == 'none' -%>
 up
 <% else -%>
-inet <%= @ipaddr %> <%= @netmask %> NONE
+inet <%= @ipaddr %> <%= @netmask %>
 <% end -%>
 <% if @ip6addr == 'auto' -%>
 rtsol