rpm/dhcp
SHA256
1
0
Fork 0
forked from pool/dhcp
Code Pull Requests Activity

Accepting request 972892 from network:dhcp

Browse Source 
- bsc#1198657: properly handle DHCRELAY(6)_OPTIONS.

OBS-URL: https://build.opensuse.org/request/show/972892
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=134
This commit is contained in:
Dominique Leuenberger 2022-04-28 21:07:07 +00:00 committed by Git OBS Bridge
commit 144dcde902
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dhcp.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 26 10:48:39 UTC 2022 - Reinhard Max <max@suse.com>
- bsc#1198657: properly handle DHCRELAY(6)_OPTIONS.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Apr 16 20:19:19 UTC 2022 - chris@computersalat.de Sat Apr 16 20:19:19 UTC 2022 - chris@computersalat.de

8
dhcrelay.script
View File

@ -86,7 +86,7 @@ case "$1" in
DHCRELAY_INTERFACES_ARGS="$DHCRELAY_INTERFACES_ARGS -i $i" DHCRELAY_INTERFACES_ARGS="$DHCRELAY_INTERFACES_ARGS -i $i"
done done
DHCRELAY_ARGS="$DHCRELAY_INTERFACES_ARGS $DHCRELAY_SERVERS" DHCRELAY_ARGS="$DHCRELAY_OPTIONS $DHCRELAY_INTERFACES_ARGS $DHCRELAY_SERVERS"
;; ;;
-6) -6)
DHCRELAY6_LOWER_INTERFACES_ARGS='' DHCRELAY6_LOWER_INTERFACES_ARGS=''
@ -104,7 +104,7 @@ case "$1" in
# service is not configured # service is not configured
exit 6; exit 6;
fi fi
DHCRELAY_ARGS="$DHCRELAY6_LOWER_INTERFACES_ARGS $DHCRELAY6_UPPER_INTERFACES_ARGS" DHCRELAY_ARGS="$DHCRELAY6_OPTIONS $DHCRELAY6_LOWER_INTERFACES_ARGS $DHCRELAY6_UPPER_INTERFACES_ARGS"
;; ;;
esac esac
## Start daemon with startproc(8). If this fails ## Start daemon with startproc(8). If this fails
@ -114,9 +114,9 @@ case "$1" in
# already running to match LSB spec. # already running to match LSB spec.
if [ "$2" = "-v" ]; then if [ "$2" = "-v" ]; then
echo echo
echo -n "executing '$DAEMON_BIN $DHCPv_OPT $DHCRELAY_OPTIONS $DHCRELAY_ARGS'" echo -n "executing '$DAEMON_BIN $DHCPv_OPT $DHCRELAY_ARGS'"
fi 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=$? rc=$?
if ! [ $rc -eq 0 ]; then if ! [ $rc -eq 0 ]; then
## be verbose ## be verbose