From e72ae15f4b728373bb60805f68b08bb1fce1f4144743a7036b22cfd65ca7eba9 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 26 Apr 2022 10:57:36 +0000 Subject: [PATCH] - bsc#1198657: properly handle DHCRELAY(6)_OPTIONS. OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=247 --- dhcp.changes | 5 +++++ dhcrelay.script | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dhcp.changes b/dhcp.changes index 784436e..bfafa26 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 26 10:48:39 UTC 2022 - Reinhard Max + +- bsc#1198657: properly handle DHCRELAY(6)_OPTIONS. + ------------------------------------------------------------------- Sat Apr 16 20:19:19 UTC 2022 - chris@computersalat.de diff --git a/dhcrelay.script b/dhcrelay.script index 994f82e..9ff2837 100644 --- a/dhcrelay.script +++ b/dhcrelay.script @@ -86,7 +86,7 @@ case "$1" in DHCRELAY_INTERFACES_ARGS="$DHCRELAY_INTERFACES_ARGS -i $i" done - DHCRELAY_ARGS="$DHCRELAY_INTERFACES_ARGS $DHCRELAY_SERVERS" + DHCRELAY_ARGS="$DHCRELAY_OPTIONS $DHCRELAY_INTERFACES_ARGS $DHCRELAY_SERVERS" ;; -6) DHCRELAY6_LOWER_INTERFACES_ARGS='' @@ -104,7 +104,7 @@ case "$1" in # service is not configured exit 6; fi - DHCRELAY_ARGS="$DHCRELAY6_LOWER_INTERFACES_ARGS $DHCRELAY6_UPPER_INTERFACES_ARGS" + DHCRELAY_ARGS="$DHCRELAY6_OPTIONS $DHCRELAY6_LOWER_INTERFACES_ARGS $DHCRELAY6_UPPER_INTERFACES_ARGS" ;; esac ## Start daemon with startproc(8). If this fails @@ -114,9 +114,9 @@ case "$1" in # already running to match LSB spec. if [ "$2" = "-v" ]; then echo - echo -n "executing '$DAEMON_BIN $DHCPv_OPT $DHCRELAY_OPTIONS $DHCRELAY_ARGS'" + echo -n "executing '$DAEMON_BIN $DHCPv_OPT $DHCRELAY_ARGS'" fi - startproc -q -l $STARTPROC_LOGFILE -p $DAEMON_PIDFILE $DAEMON_BIN $DHCPv_OPT $DHCRELAY_OPTIONS $DHCRELAY_ARGS >/dev/null 2>&1 + startproc -q -l $STARTPROC_LOGFILE -p $DAEMON_PIDFILE $DAEMON_BIN $DHCPv_OPT $DHCRELAY_ARGS >/dev/null 2>&1 rc=$? if ! [ $rc -eq 0 ]; then ## be verbose