diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-03-04 11:26:41 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:06 +0100 |
| commit | fa32070515baa0156f7cf59e9d06a4a3a468c409 (patch) | |
| tree | 0e17e8295b057bb7835d1947484b8656daa383af /scripts | |
| parent | 7d9234da6fa3edc5ed7fc93aff1457a9a0cb4b0e (diff) | |
| download | live-boot-fa32070515baa0156f7cf59e9d06a4a3a468c409.tar.gz live-boot-fa32070515baa0156f7cf59e9d06a4a3a468c409.zip | |
Creating resolv.conf when netbooting not just when there's no resolv.conf, but also when it is empty.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live-bottom/23networking | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking index 603116f..6c726c6 100755 --- a/scripts/live-bottom/23networking +++ b/scripts/live-bottom/23networking @@ -98,22 +98,24 @@ EOF done fi - if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ] + if [ ! -f /root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf)" ] then - # create a resolv.conf if it is not present - cp /netboot.config /root/var/log/netboot.config + if [ -f /netboot.config ] + then + # create a resolv.conf if it is not present or empty + cp /netboot.config /root/var/log/netboot.config - rc_search=$(cat netboot.config | awk '/domain/{print $3}') - rc_server0=$(cat netboot.config | awk '/dns0/{print $5}') - rc_server1=$(cat netboot.config | awk '/dns0/{print $8}') - rc_server0="nameserver ${rc_server0}" + rc_search=$(cat netboot.config | awk '/domain/{print $3}') + rc_server0=$(cat netboot.config | awk '/dns0/{print $5}') + rc_server1=$(cat netboot.config | awk '/dns0/{print $8}') + rc_server0="nameserver ${rc_server0}" - if [ "${rc_server1}" = "0.0.0.0" ] - then - rc_server1="" - else - rc_server1="nameserver ${rc_server1}" - fi + if [ "${rc_server1}" = "0.0.0.0" ] + then + rc_server1="" + else + rc_server1="nameserver ${rc_server1}" + fi cat > /root/etc/resolv.conf << EOF # /etc/resolv.conf @@ -124,7 +126,8 @@ ${rc_server0} ${rc_server1} EOF - cat /root/etc/resolv.conf >> /root/var/log/netboot.config + cat /root/etc/resolv.conf >> /root/var/log/netboot.config + fi fi fi |