netifd: always send DHCPv4 hostname

[openwrt/staging/chunkeey.git] / package / network / config / netifd / files / lib / netifd / proto / dhcp.sh

diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
index 7085bd2aa61c94e4d789e57e95807ecfc220cdeb..143e4451b6648ac2048b782989f7bb1c50f800d8 100755 (executable)
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -21,14 +21,15 @@ proto_dhcp_init_config() {
        proto_config_add_string zone
        proto_config_add_string mtu6rd
        proto_config_add_string customroutes
+       proto_config_add_boolean classlessroute
 }
 
 proto_dhcp_setup() {
        local config="$1"
        local iface="$2"
 
-       local ipaddr hostname clientid vendorid broadcast release reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
-       json_get_vars ipaddr hostname clientid vendorid broadcast release reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
+       local ipaddr hostname clientid vendorid broadcast release reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes classlessroute
+       json_get_vars ipaddr hostname clientid vendorid broadcast release reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes classlessroute
 
        local opt dhcpopts
        for opt in $reqopts; do
@@ -39,6 +40,7 @@ proto_dhcp_setup() {
                append dhcpopts "-x $opt"
        done
 
+       [ -z "$hostname" ] && hostname="$(cat /proc/sys/kernel/hostname)"
        [ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
        [ "$release" = 1 ] && release="-R" || release=
        [ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
@@ -49,6 +51,8 @@ proto_dhcp_setup() {
        [ -n "$mtu6rd" ] && proto_export "MTU6RD=$mtu6rd"
        [ -n "$customroutes" ] && proto_export "CUSTOMROUTES=$customroutes"
        [ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0"
+       # Request classless route option (see RFC 3442) by default
+       [ "$classlessroute" = "0" ] || append dhcpopts "-O 121"
 
        proto_export "INTERFACE=$config"
        proto_run_command "$config" udhcpc \
@@ -56,8 +60,8 @@ proto_dhcp_setup() {
                -s /lib/netifd/dhcp.script \
                -f -t 0 -i "$iface" \
                ${ipaddr:+-r $ipaddr} \
-               ${hostname:+-H $hostname} \
-               ${vendorid:+-V $vendorid} \
+               ${hostname:+-x "hostname:$hostname"} \
+               ${vendorid:+-V "$vendorid"} \
                $clientid $broadcast $release $dhcpopts
 }