1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 15_networking_grml.dpatch by Christian Hofstaedtler <ch@grml.org>
3 ## Licensed under GPLv2+.
5 ## All lines beginning with `## DP:' are a description of the patch.
6 ## DP: Ship our own networking script, which is compatible with the kernel's
7 ## DP: notion of ip= as well as resolvconf.
11 diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
12 Index: live-boot-grml/components/9990-grml-networking.sh
13 ===================================================================
14 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
15 +++ live-boot-grml/components/9990-grml-networking.sh 2014-03-08 16:34:29.800254396 +0100
23 +if [ -n "${NONETWORKING}" ]; then
27 +modprobe af_packet # req'd for DHCP
30 +# (this /might/ be required for firmware loading to complete)
31 +if grep -q noudev /proc/cmdline; then
32 + log_begin_msg "Networking: Skipping udev as requested via bootoption noudev."
38 +if [ -n "${IP}" ]; then
39 + # call into initramfs-tools provided network setup functions, so basic
40 + # networking is fine.
41 + log_begin_msg "Networking: Waiting for basic network to come up..."
42 + configure_networking
45 +# prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
46 +IFFILE="/root/etc/network/interfaces"
47 +if [ -L /root/etc/resolv.conf ] ; then
48 + # assume we have resolvconf
49 + RESOLVCONF=/root/etc/resolvconf/resolv.conf.d/base
51 + RESOLVCONF="/root/etc/resolv.conf"
54 +# config for loopback networking
56 +# Initially generated on boot by initramfs' 23networking.
59 +iface lo inet loopback
65 +# generate config for each present network device
66 +for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*; do
67 + [ -e ${interface} ] || continue
68 + interface=$(basename ${interface})
71 + # NODHCP or a previously run ipconfig mean that ifupdown should never
72 + # touch this interface (IP-stack wise).
73 + netconfig=/run/net-${interface}.conf
74 + if [ -n "$NODHCP" ] || [ -e "${netconfig}" ]; then
78 + # if boot option "nodhcp" is set but also boot option "dhcp" is
79 + # set, then dhcp should win over it as we default to dhcp and if
80 + # nodhcp is used as default boot option but "dhcp" is added then it
81 + # would be confusing to not get a working network setup
82 + if [ "$DHCP" = "true" ] ; then
86 + cat >> $IFFILE << EOF
87 +allow-hotplug ${interface}
88 +iface ${interface} inet ${method}
91 + # DNS for resolvconf and /etc/resolv.conf
92 + if [ -e "${netconfig}" ]; then
94 + if [ -n "${DNSDOMAIN}" ]; then
95 + echo " dns-search ${DNSDOMAIN}" >> $IFFILE
97 + # make sure we don't have any 0.0.0.0 nameservers
99 + for IPV4DNS in ${IPV4DNS0} ${IPV4DNS1}; do
100 + [ -n "${IPV4DNS}" ] || continue
101 + [ "${IPV4DNS}" != "0.0.0.0" ] || continue
102 + IPV4DNSLIST="${IPV4DNSLIST}${IPV4DNS} "
104 + if [ -n "${IPV4DNSLIST}" ]; then
105 + echo " dns-nameservers ${IPV4DNSLIST}" >> $IFFILE
106 + for IPV4DNS in ${IPV4DNSLIST}; do
107 + echo "nameserver ${IPV4DNS}" >> $RESOLVCONF
112 + if [ -z "$NODHCPHOSTNAME" -a -n "$HOSTNAME" ]; then
113 + echo $HOSTNAME > /root/etc/hostname
116 + unset DEVICE IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1 HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH filename
117 + unset IPV4DNS IPV4DNSLIST
123 +if [ -n "$DNSSERVER1" ]
125 + # disable any existing entries
126 + if [ -r $RESOLVCONF ]
128 + sed -i 's/nameserver/# nameserver/' $RESOLVCONF
130 + for i in $DNSSERVER1 $DNSSERVER2
132 + echo "nameserver $i" >> $RESOLVCONF
137 Index: live-boot-grml/components/9990-main.sh
138 ===================================================================
139 --- live-boot-grml.orig/components/9990-main.sh 2014-03-08 16:27:40.668243817 +0100
140 +++ live-boot-grml/components/9990-main.sh 2014-03-08 16:27:40.664244286 +0100
150 Index: live-boot-grml/components/9990-cmdline-old
151 ===================================================================
152 --- live-boot-grml.orig/components/9990-cmdline-old 2014-03-08 16:27:34.117012248 +0100
153 +++ live-boot-grml/components/9990-cmdline-old 2014-03-08 16:33:20.536378749 +0100
168 + NODHCPHOSTNAME="Yes"
169 + export NODHCPHOSTNAME