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

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

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=247
This commit is contained in:
Reinhard Max 2022-04-26 10:57:36 +00:00 committed by Git OBS Bridge
parent a663d48ab0
commit e72ae15f4b
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

8
dhcrelay.script
View File

@ -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