diff options
author | Dirk | 2011-07-19 14:57:57 +0200 |
---|---|---|
committer | Dirk | 2011-07-19 14:57:57 +0200 |
commit | caedae37906512788be4d0559e2ba94348d17559 (patch) | |
tree | 841a9b8be9febc86e526a31d9e07da0250d66011 /src/initramfs/scripts/bin/servconfig | |
parent | Some more changes for emu/virt plugins ... (diff) | |
parent | fix for empty search domains (diff) | |
download | core-caedae37906512788be4d0559e2ba94348d17559.tar.gz core-caedae37906512788be4d0559e2ba94348d17559.tar.xz core-caedae37906512788be4d0559e2ba94348d17559.zip |
Merge branch 'master' of openslx.org:openslx/core
Diffstat (limited to 'src/initramfs/scripts/bin/servconfig')
-rwxr-xr-x | src/initramfs/scripts/bin/servconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/initramfs/scripts/bin/servconfig b/src/initramfs/scripts/bin/servconfig index f9990c06..84544e23 100755 --- a/src/initramfs/scripts/bin/servconfig +++ b/src/initramfs/scripts/bin/servconfig @@ -129,9 +129,9 @@ echo -e "# /etc/resolv.conf - file generated by\n#\t$0:\n\ #\t${date}\n#options timeout:1 attempts:1 rotate" > $out [ "x${domain_name}" != "x" ] && echo -e "domain ${domain_name}" >> $out -[ -n "${domain_search}" ] && echo -e "search ${domain_search}" >> $out +[ "x${domain_search}" != "x" ] && echo -e "search ${domain_search}" >> $out # fallback -[ ! -n "${domain_search}" ] && [ -n ${domain_name} ] && \ +[ "x${domain_search}" == "x" ] && [ "x${domain_name}" != "x" ] && \ echo -e "search ${domain_name}" >> $out [ -n "${domain_name_servers}" ] && { |