Browse Source

Revert to per-device resolv.conf by Seewer's suggestion.

master
Warren Togami 16 years ago
parent
commit
157a8ddf5c
  1. 4
      modules.d/40network/dhclient-script
  2. 2
      modules.d/40network/netroot
  3. 2
      modules.d/45ifcfg/write-ifcfg.sh

4
modules.d/40network/dhclient-script

@ -32,12 +32,12 @@ setup_interface() { @@ -32,12 +32,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/resolv.conf
[ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
if [ -n "$namesrv" ] ; then
for s in $namesrv; do
echo nameserver $s
done
fi >> /tmp/resolv.conf
fi >> /tmp/net.$netif.resolv.conf

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

2
modules.d/40network/netroot

@ -75,7 +75,7 @@ done @@ -75,7 +75,7 @@ done

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

# Load interface options
[ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override

2
modules.d/45ifcfg/write-ifcfg.sh

@ -55,6 +55,6 @@ done @@ -55,6 +55,6 @@ done
mkdir /dev/.initramfs/
cp /tmp/net.* /dev/.initramfs/ >/dev/null 2>&1
mkdir -p /dev/.initramfs/state/etc/sysconfig/network-scripts/
cp /tmp/resolv.conf /dev/.initramfs/state/etc/ >/dev/null 2>&1
cp /tmp/net.$netif.resolv.conf /dev/.initramfs/state/etc/ >/dev/null 2>&1
echo "files /etc/sysconfig/network-scripts" > /dev/.initramfs/rwtab
cp -a /tmp/ifcfg/* /dev/.initramfs/state/etc/sysconfig/network-scripts/ >/dev/null 2>&1

Loading…
Cancel
Save