From 6af6728603d610e06840f02f45474ca26117f6dd Mon Sep 17 00:00:00 2001 From: Markus Gothe Date: Tue, 11 Nov 2025 13:40:32 +0100 Subject: [PATCH] obuspa: Don't add empty whitespace to reqopts. --- .../files/etc/uci-defaults/86-set-gateway-device-info | 4 ++-- obuspa/files/etc/uci-defaults/obuspa-set-dhcp-option | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gateway-info/files/etc/uci-defaults/86-set-gateway-device-info b/gateway-info/files/etc/uci-defaults/86-set-gateway-device-info index 49cd71c3d..10456fd45 100644 --- a/gateway-info/files/etc/uci-defaults/86-set-gateway-device-info +++ b/gateway-info/files/etc/uci-defaults/86-set-gateway-device-info @@ -110,7 +110,7 @@ configure_send_op125() { if [ "${uci}" = "network" ]; then - new_send_opt="$sendopt $opt125" + [ -n "${sendopt}" ] && new_send_opt="$sendopt $opt125" || new_send_opt="$opt125" uci -q set network."${intf}".sendopts="$new_send_opt" else new_send_opt="$sendopt$opt125" @@ -228,7 +228,7 @@ enable_dhcp_option125() { if [ "${proto}" = "dhcp" ]; then if [ ${req125_present} -eq 0 ]; then - newreqopts="$reqopts 125" + [ -n "${reqopts}" ] && newreqopts="$reqopts 125" || newreqopts="125" uci -q set network."${wan}".reqopts="$newreqopts" fi diff --git a/obuspa/files/etc/uci-defaults/obuspa-set-dhcp-option b/obuspa/files/etc/uci-defaults/obuspa-set-dhcp-option index eefa76475..9bc281eae 100644 --- a/obuspa/files/etc/uci-defaults/obuspa-set-dhcp-option +++ b/obuspa/files/etc/uci-defaults/obuspa-set-dhcp-option @@ -58,12 +58,12 @@ configure_dhcp_options() { if [ "${proto}" = "dhcp" ]; then if [ ${req125_present} -eq 0 ]; then - newreqopts="$reqopts 125" + [ -n "${reqopts}" ] && newreqopts="$reqopts 125" || newreqopts="125" uci -q set network."${interface}".reqopts="$newreqopts" fi if [ ${send124_present} -eq 0 ]; then - newsendopts="${sendopts} 124:00:00:0D:E9:04:03:75:73:70" + [ -n "${sendopts}" ] && newsendopts="${sendopts} 124:00:00:0D:E9:04:03:75:73:70" || newsendopts="124:00:00:0D:E9:04:03:75:73:70" uci -q set network."${interface}".sendopts="$newsendopts" fi fi