diff options
| author | Sebastian Schmelzer | 2011-05-26 16:32:54 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-05-26 16:32:54 +0200 |
| commit | 5802599a1ff3bc66197ef85e1ed7f1925d56901c (patch) | |
| tree | 4a9828d8834aad231c01496dcd3ec37f69a42600 /src/initramfs | |
| parent | add support for domain search lists to busybox udhc (diff) | |
| download | core-5802599a1ff3bc66197ef85e1ed7f1925d56901c.tar.gz core-5802599a1ff3bc66197ef85e1ed7f1925d56901c.tar.xz core-5802599a1ff3bc66197ef85e1ed7f1925d56901c.zip | |
add support for domain_search dhcp parameter
Diffstat (limited to 'src/initramfs')
| -rwxr-xr-x | src/initramfs/scripts/bin/dhcpmkconfig | 6 | ||||
| -rw-r--r-- | src/initramfs/scripts/etc/functions | 2 |
2 files changed, 6 insertions, 2 deletions
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; diff --git a/src/initramfs/scripts/etc/functions b/src/initramfs/scripts/etc/functions index 363f2fbc..3e8d4904 100644 --- a/src/initramfs/scripts/etc/functions +++ b/src/initramfs/scripts/etc/functions @@ -274,7 +274,7 @@ mkdir /var/lib/dhcp >/dev/null 2>&1 testmkd /usr/share/udhcpc ln -sf /bin/dhcpmkconfig /usr/share/udhcpc/default.script # see for options.c file in udhcp subdir of busybox for accepted "-O option" -udhcpc -O nissrv -O nisdomain -t 8 -q $vci \ +udhcpc -O search -O nissrv -O nisdomain -t 8 -q $vci \ -s /usr/share/udhcpc/default.script -i $nwif 2>/dev/null } |