From: Stephen Gran Date: Sun, 8 Nov 2009 17:03:11 +0000 (+0000) Subject: we don't want to sort the search paths, we already put them in in order X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e2aa99d27452b535b899c69d0e28eba60e675bd6;p=mirror%2Fdsa-puppet.git we don't want to sort the search paths, we already put them in in order Signed-off-by: Stephen Gran --- diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index 1bf9dda18..dc5db93f9 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -27,7 +27,7 @@ if nameservers.empty? raise Puppet::ParseError, "Something has gone wrong writing resolv.conf: probably included for wrong hoster" end -resolvconf += "search " + searchpaths.sort.join(" ") + "\n" +resolvconf += "search " + searchpaths.join(" ") + "\n" nameservers.each do |ns| resolvconf += "nameserver " + ns + "\n" end