diff options
| author | Sebastian Schmelzer | 2011-05-26 17:30:32 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-05-26 17:30:32 +0200 |
| commit | 2aa9f867e01781674c0044a653302c25c4fe0c45 (patch) | |
| tree | 9a6f684029de866dcc424c44dbd7a040f3ef5c2d /src/initramfs/scripts/bin/dhcpmkconfig | |
| parent | add support for domain_search dhcp parameter (diff) | |
| download | core-2aa9f867e01781674c0044a653302c25c4fe0c45.tar.gz core-2aa9f867e01781674c0044a653302c25c4fe0c45.tar.xz core-2aa9f867e01781674c0044a653302c25c4fe0c45.zip | |
fix hostname / resolv.conf generation
Diffstat (limited to 'src/initramfs/scripts/bin/dhcpmkconfig')
| -rwxr-xr-x | src/initramfs/scripts/bin/dhcpmkconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/initramfs/scripts/bin/dhcpmkconfig b/src/initramfs/scripts/bin/dhcpmkconfig index 1c6bc1e7..881a9335 100755 --- a/src/initramfs/scripts/bin/dhcpmkconfig +++ b/src/initramfs/scripts/bin/dhcpmkconfig @@ -36,16 +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 "domain $domain\n" >/etc/resolv.conf if [ -n "$search" ]; then - echo "search $search\n" >/etc/resolv.conf + echo "search $search\n" >>/etc/resolv.conf else - [ -n "$domain" ] && echo -e "search $domain\n" >/etc/resolv.conf + [ -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; done; } +#generate local /etc/hostname +echo $hostname.$domain > /etc/hostname |