Browse Source

There is only one resolv.conf.

master
Warren Togami 16 years ago
parent
commit
984a819b92
  1. 4
      modules.d/40network/dhclient-script
  2. 2
      modules.d/40network/netroot
  3. 1
      modules.d/99base/init

4
modules.d/40network/dhclient-script

@ -23,12 +23,12 @@ setup_interface() { @@ -23,12 +23,12 @@ setup_interface() {

[ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw

[ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
[ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/resolv.conf
if [ -n "$namesrv" ] ; then
for s in $namesrv; do
echo nameserver $s
done
fi >> /tmp/net.$netif.resolv.conf
fi >> /tmp/resolv.conf

[ -n "$hostname" ] && echo hostname $hostname > /tmp/net.$netif.hostname
}

2
modules.d/40network/netroot

@ -90,7 +90,7 @@ done @@ -90,7 +90,7 @@ done

[ -e /tmp/net.$netif.gw ] && . /tmp/net.$netif.gw
[ -e /tmp/net.$netif.hostname ] && . /tmp/net.$netif.hostname
[ -e /tmp/net.$netif.resolv.conf ] && cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf
[ -e /tmp/resolv.conf ] && cp -f /tmp/resolv.conf /etc/resolv.conf

# Source netroot hooks before we start the handler
source_all netroot

1
modules.d/99base/init

@ -223,6 +223,7 @@ if getarg rdcopystate; then @@ -223,6 +223,7 @@ if getarg rdcopystate; then
cp /tmp/* /dev/.initramfs/ >/dev/null 2>&1
else
cp /tmp/net.* /dev/.initramfs/ >/dev/null 2>&1
cp /tmp/resolv.conf /dev/.initramfs/ >/dev/null 2>&1
cp -a /tmp/ifcfg/ /dev/.initramfs/ >/dev/null 2>&1
fi


Loading…
Cancel
Save