From fbe6accdf38e53916c5e8b83883733aaa6a23278 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 30 Jan 2024 07:45:41 +0100 Subject: [PATCH] Clarify what happens without /plen Co-authored-by: Tobias Waldekranz --- board/common/rootfs/usr/share/udhcpc/default.script | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/board/common/rootfs/usr/share/udhcpc/default.script b/board/common/rootfs/usr/share/udhcpc/default.script index b27c62e1..1e5e9f75 100755 --- a/board/common/rootfs/usr/share/udhcpc/default.script +++ b/board/common/rootfs/usr/share/udhcpc/default.script @@ -8,7 +8,7 @@ IP_CACHE="/var/lib/misc/${interface}.cache" RESOLV_CONF="/run/resolvconf/interfaces/${interface}.conf" NTPFILE="/run/chrony/dhcp-sources.d/${interface}.sources" [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" -[ -n "$subnet" ] && NETMASK="$subnet" +[ -n "$subnet" ] || subnet=32 [ -n "$metric" ] || metric=100 # Handle stateful DHCPv6 like DHCPv4 @@ -105,13 +105,7 @@ case "$ACTION" in /usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface fi - if [ -n "$NETMASK" ]; then - IP=$ip/$NETMASK - else - IP=$ip - fi - - if /bin/ip addr add dev $interface $IP $BROADCAST proto 5; then + if /bin/ip addr add dev $interface $ip/$subnet $BROADCAST proto 5; then echo "$ip" > "$IP_CACHE" fi if [ -n "$ipv6" ] ; then