From 5802599a1ff3bc66197ef85e1ed7f1925d56901c Mon Sep 17 00:00:00 2001 From: Sebastian Schmelzer Date: Thu, 26 May 2011 16:32:54 +0200 Subject: add support for domain_search dhcp parameter --- src/initramfs/scripts/bin/dhcpmkconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/initramfs/scripts/bin/dhcpmkconfig') diff --git a/src/initramfs/scripts/bin/dhcpmkconfig b/src/initramfs/scripts/bin/dhcpmkconfig index fa01db75..1c6bc1e7 100755 --- a/src/initramfs/scripts/bin/dhcpmkconfig +++ b/src/initramfs/scripts/bin/dhcpmkconfig @@ -39,7 +39,11 @@ set | sed \ -e "s,wins,netbios_name_servers,;/OPTIND.*/d" >>/tmp/confviadhcp # generate a local /etc/resolv.conf (might overwrite the version from preboot) -[ -n "$domain" ] && echo -e "search $domain\n" >/etc/resolv.conf +if [ -n "$search" ]; then + echo "search $search\n" >/etc/resolv.conf +else + [ -n "$domain" ] && echo -e "search $domain\n" >/etc/resolv.conf +fi test -n "$dns" && { for name in $dns; do echo nameserver $name >>/etc/resolv.conf; -- cgit v1.2.3-55-g7522