diff options
| author | Dirk von Suchodoletz | 2009-01-28 19:47:51 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-01-28 19:47:51 +0100 |
| commit | a83e113840517646f2cad88f522f1539bd825114 (patch) | |
| tree | e407fd8e1b9bbe19a0daed907960b4f3543e7ba7 /initramfs/stage3-stuff/bin/dhcpmkconfig | |
| parent | Fix to pass on dns server ip from preboot to stage3. (diff) | |
| download | core-a83e113840517646f2cad88f522f1539bd825114.tar.gz core-a83e113840517646f2cad88f522f1539bd825114.tar.xz core-a83e113840517646f2cad88f522f1539bd825114.zip | |
Rest of dns server ip passing to stage3, simple fix for suse
configuration.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2548 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/stage3-stuff/bin/dhcpmkconfig')
| -rwxr-xr-x | initramfs/stage3-stuff/bin/dhcpmkconfig | 4 |
1 files changed, 2 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; |