diff options
Diffstat (limited to 'initramfs/stage3-stuff')
| -rwxr-xr-x | initramfs/stage3-stuff/bin/dhcpmkconfig | 4 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/init | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/initramfs/stage3-stuff/bin/dhcpmkconfig b/initramfs/stage3-stuff/bin/dhcpmkconfig index aee0eb6d..c8bf73d8 100755 --- a/initramfs/stage3-stuff/bin/dhcpmkconfig +++ b/initramfs/stage3-stuff/bin/dhcpmkconfig @@ -31,8 +31,8 @@ set | sed \ -e "s,nissrv,nis_servers,;s,nisdomain_name,nis_domain," \ -e "s,wins,netbios_name_servers,;/OPTIND.*/d" >>/tmp/confviadhcp -# erzeugen einer lokalen /etc/resolv.conf -echo -e "search $domain\n" >/etc/resolv.conf +# generate a local /etc/resolv.conf (might overwrite the version from preboot) +[ -n "$domain" ] && echo -e "search $domain\n" >/etc/resolv.conf test -n "$dns" && { for name in $dns; do echo nameserver $name >>/etc/resolv.conf; diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index d3034a00..13a08a9d 100755 --- a/initramfs/stage3-stuff/init +++ b/initramfs/stage3-stuff/init @@ -414,6 +414,9 @@ if [ -n "$ipinfo" ] ; then serverip=$(getip 2) gateway=$(getip 3) subnet_mask=$(getip 4) + # we might have an idea of the dns server via preboot + dns_srv=$(getip 5) + [ -n "$dns_srv" ] && echo nameserver $dns_srv >/etc/resolv.conf; echo -e "# ip configuration written by $0 script:\nclientip=$clientip\n\ subnet_mask=$subnet_mask\ngateway=$gateway\nserverip=$serverip" \ >>/etc/initramfs-setup |