Merge pull request #16 from Stella-IT/feat/dhcp-hostname

feat: send hostname in DHCP requests

Author: winstar0070

kvmapp/system/init.d/S30eth

@@ -19,6 +19,10 @@ EOF
 }
 
 start() {
+    HOSTNAME=$(cat /etc/hostname 2>/dev/null | head -1)
+    HOSTNAME_OPT=""
+    [ -n "$HOSTNAME" ] && HOSTNAME_OPT="-x hostname:$HOSTNAME"
+
     ip addr flush dev eth0
     if [ -e /boot/eth.nodhcp ]; then
         while IFS= read -r line || [ -n "$line" ]; do
@@ -39,15 +43,15 @@ start() {
         done < /boot/eth.nodhcp
 
         ip a show dev eth0 | grep inet > /dev/null || {
-            udhcpc -i eth0 -t 3 -T 1 -A 5 -b -p /run/udhcpc.eth0.pid &>/dev/null
+            udhcpc -i eth0 -t 3 -T 1 -A 5 -b -O 121 $HOSTNAME_OPT -p /run/udhcpc.eth0.pid &>/dev/null
             ip a show dev eth0 | grep inet > /dev/null
         } || {
             inet=$RESERVE_INET
             addr=${inet%/*}
             ip a add "$inet" brd + dev eth0
         } || exit 1
     else
-        udhcpc -i eth0 -t 10 -T 1 -A 5 -b -p /run/udhcpc.eth0.pid &
+        udhcpc -i eth0 -t 10 -T 1 -A 5 -b -O 121 $HOSTNAME_OPT -p /run/udhcpc.eth0.pid &
     fi
 }
 

kvmapp/system/init.d/S30wifi

@@ -49,6 +49,10 @@ gen_dnsmasq_conf() {
 }
 
 start() {
+    HOSTNAME=$(cat /etc/hostname 2>/dev/null | head -1)
+    HOSTNAME_OPT=""
+    [ -n "$HOSTNAME" ] && HOSTNAME_OPT="-x hostname:$HOSTNAME"
+
     echo "wifi mode: sta"
     ssid=""
     pass=""
@@ -73,7 +77,7 @@ start() {
     wpa_passphrase "$ssid" "$pass" >>/etc/wpa_supplicant.conf
     wpa_supplicant -B -i wlan0 -c /etc/wpa_supplicant.conf
     if [ ! -e /boot/wifi.nodhcp ]; then
-        (udhcpc -i wlan0 -t 10 -T 1 -A 5 -b -p /run/udhcpc.wlan0.pid) &
+        (udhcpc -i wlan0 -t 10 -T 1 -A 5 -b -O 121 $HOSTNAME_OPT -p /run/udhcpc.wlan0.pid) &
     fi
 }