return
fi
- # FIXME: stop hardcoding overloading of initramfs-tools functions
- . /scripts/functions
- . /lib/live/boot/9990-initramfs-tools.sh
-
log_begin_msg "Preconfiguring networking"
IFFILE="/root/etc/network/interfaces"
- DNSFILE="/root/etc/resolv.conf"
+ if [ -L /root/etc/resolv.conf ] ; then
+ # assume we have resolvconf
+ DNSFILE="/root/etc/resolvconf/resolv.conf.d/base"
+ else
+ DNSFILE="/root/etc/resolv.conf"
+ fi
if [ "${STATICIP}" = "frommedia" ] && [ -e "${IFFILE}" ]
then
fi
done
else
- if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
+ if [ -n "${NODHCP}" ]
+ then
+ # force DHCP off
+ method="manual"
+ elif [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
then
# default, dhcp assigned
method="dhcp"
# iterate the physical interfaces and add them to the interfaces list and also add when ethdevice= called on cmdline
if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ]) || [ ! -z "${ETHDEVICE}" ]
then
- for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
+ for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan* /sys/class/net/en*
do
[ -e ${interface} ] || continue
i="$(basename ${interface})"
done
fi
- if [ ! -f /root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf)" ]
+ if [ ! -f "${DNSFILE}" ] || [ -z "$(cat ${DNSFILE})" ]
then
if [ -f /netboot.config ]
then
rc_search=$(cat netboot.config | awk '/domain/ { print $3 }')
rc_server0="$(cat netboot.config | awk '/dns0/ { print $5 }')"
-cat > /root/etc/resolv.conf << EOF
+cat > $DNSFILE << EOF
search ${rc_search}
domain ${rc_search}
nameserver ${rc_server0}
if [ "${rc_server1}" != "0.0.0.0" ]
then
- echo "nameserver ${rc_server1}" >> /root/etc/resolv.conf
+ echo "nameserver ${rc_server1}" >> $DNSFILE
fi
- cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+ cat $DNSFILE >> /root/var/log/netboot.config
fi
fi
fi