diff options
Diffstat (limited to 'src/initramfs/scripts/bin/dhcpmkconfig')
| -rwxr-xr-x | src/initramfs/scripts/bin/dhcpmkconfig | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/initramfs/scripts/bin/dhcpmkconfig b/src/initramfs/scripts/bin/dhcpmkconfig index fa01db75..f154d95e 100755 --- a/src/initramfs/scripts/bin/dhcpmkconfig +++ b/src/initramfs/scripts/bin/dhcpmkconfig @@ -36,12 +36,20 @@ set | sed \ -e "s,domain,domain_name,;s,dns,domain_name_servers," \ -e "s,broadcast,broadcast_address,;s,dhc.*,,;/^$/d" \ -e "s,nissrv,nis_servers,;s,nisdomain_name,nis_domain," \ + -e "s,search,domain_search," \ -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 +[ -n "$domain" ] && echo -e "domain $domain" >/etc/resolv.conf +if [ -n "$search" ]; then + echo -e "search $search" >>/etc/resolv.conf +else + [ -n "$domain" ] && echo -e "search $domain" >>/etc/resolv.conf +fi test -n "$dns" && { for name in $dns; do echo nameserver $name >>/etc/resolv.conf; done; } +#generate local /etc/hostname +echo $hostname.$domain > /etc/hostname |