Merge pull request #52 from JedMeister/add-hostname-to-dhcp-requests

Add hostname to dhcp requests (and other refactoring)

Author: JedMeister

firstboot.d/01ipconfig

@@ -3,36 +3,49 @@
 
 . /etc/default/inithooks
 
-[ -e $INITHOOKS_CONF ] && . $INITHOOKS_CONF
-[ -z "$IP_CONFIG" ] && exit 0
-[ "$IP_CONFIG" != "manual" ] && [ "$IP_CONFIG" != "static" ] && [ "$IP_CONFIG" != "dhcp" ] && exit 1
-[ ! -e /etc/network/interfaces ] && exit 1
-
-# if IP_CONFIG is not changed skip this script and avoid a interface reconfiguration
-grep "iface eth0 inet $IP_CONFIG" /etc/network/interfaces >/dev/null && exit 0
-
-ifdown --exclude=lo -a
-
-# since debian 8 (systemd) ifdown does no longer take the interface down
-# if we change between manual, static or dhcp this does not work anymore
-# as ifup won't do anything
-ip link set eth0 down
-
-echo "# interfaces(5) file used by ifup(8) and ifdown(8)" >/etc/network/interfaces
-echo >>/etc/network/interfaces
-echo "auto lo" >>/etc/network/interfaces
-echo "iface lo inet loopback" >>/etc/network/interfaces
-echo >>/etc/network/interfaces
-echo "auto eth0" >>/etc/network/interfaces
-echo "iface eth0 inet $IP_CONFIG" >>/etc/network/interfaces
-echo " hostname $(head -1 /etc/hostname)" >>/etc/network/interfaces
-
-if [ "$IP_CONFIG" = "static" ]; then
- echo " address $IP_ADDRESS" >>/etc/network/interfaces
- echo " netmask $IP_NETMASK" >>/etc/network/interfaces
- echo " gateway $IP_GW" >>/etc/network/interfaces
- echo " dns-nameservers $IP_DNS1 $IP_DNS2" >>/etc/network/interfaces
-fi
+fatal() { echo "fatal $@" >&2; exit 1; }
+
+[[ -e $INITHOOKS_CONF ]] && . $INITHOOKS_CONF
+[[ -z "$IP_CONFIG" ]] && exit 0
+[[ "$IP_CONFIG" != "manual" ]] \
+    && [[ "$IP_CONFIG" != "static" ]] \
+    && [[ "$IP_CONFIG" != "dhcp" ]] \
+    && fatal "IP_CONFIG set incorrectly"
+[[ ! -e /etc/network/interfaces ]] && fatal "intefaces file not found"
+
+APP=$(turnkey-version -n)
+
+IP_IFACE="eth0"
+[[ "$APP" == "lxc" ]] && IP_IFACE="br0"
+
+# if IP_CONFIG is not changed skip this script and avoid a interface
+# reconfiguration
+grep "iface $IP_IFACE inet $IP_CONFIG" /etc/network/interfaces >/dev/null \
+    && exit 0
+
+# since debian 8 (systemd) ifdown no longer takes the interface down if we
+# change between manual, static or dhcp so using 'ip' instead
+ip link set $IP_IFACE down
+
+cat > /etc/network/interfaces <<EOF
+# interfaces(5) file - generated by TurnKey firstboot
+
+auto lo
+iface lo inet loopback
+
+auto $IP_IFACE
+iface $IP_IFACE inet $IP_CONFIG
+    hostname $(head -1 /etc/hostname)
+EOF
+
+if [[ "$IP_CONFIG" == "static" ]]; then
+    cat > /etc/network/interfaces <<EOF
+    hostname $(head -1 /etc/hostname)
+    address $IP_ADDRESS
+    netmask $IP_NETMASK
+    gateway $IP_GW
+    dns-nameservers $IP_DNS1 $IP_DNS2
+EOF
 
 ifup --exclude=lo -a
 

firstboot.d/09hostname

@@ -14,6 +14,7 @@ for file in \
    /etc/printcap \
    /etc/hostname \
    /etc/hosts \
+   /etc/network/interfaces \
    /etc/ssh/ssh_host_rsa_key.pub \
    /etc/ssh/ssh_host_dsa_key.pub \
    /etc/ssh/ssh_host_ecdsa_key.pub \