Add instance for sourcing /etc/network/interfaces.d/ only once

[live-boot-grml.git] / components / 9990-grml-networking.sh

diff --git a/components/9990-grml-networking.sh b/components/9990-grml-networking.sh
index 49ceb81..0bc5ed2 100644 (file)
--- a/components/9990-grml-networking.sh
+++ b/components/9990-grml-networking.sh
@@ -8,6 +8,8 @@ if [ -n "${NONETWORKING}" ]; then
    return 0
 fi
 
+log_begin_msg "Preconfiguring Grml networking"
+
 modprobe af_packet # req'd for DHCP
 
 # initialize udev
@@ -37,7 +39,7 @@ fi
 
 # config for loopback networking
 cat > $IFFILE << EOF
-# Initially generated on boot by initramfs' 23networking.
+# Initially generated on boot by initramfs
 
 auto lo
 iface lo inet loopback
@@ -47,9 +49,10 @@ EOF
 unset HOSTNAME
 
 # generate config for each present network device
-for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*; do
+for interface in /sys/class/net/* ; do
     [ -e ${interface} ] || continue
     interface=$(basename ${interface})
+    [ "${interface}" = "lo" ] && continue
     method="dhcp"
 
     # NODHCP or a previously run ipconfig mean that ifupdown should never
@@ -94,7 +97,7 @@ iface ${interface} inet ${method}
 EOF
     else
       cat >> $IFFILE << EOF
-auto ${interface}
+allow-hotplug ${interface}
 iface ${interface} inet ${method}
 EOF
     fi
@@ -132,6 +135,10 @@ EOF
     echo>> $IFFILE
 done
 
+echo '# Support overriding defaults:' >> $IFFILE
+echo 'source /etc/network/interfaces.d/*' >> $IFFILE
+echo>> $IFFILE
+
 # dns bootoption
 if [ -n "$DNSSERVERS" ]
 then