mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 05:51:45 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/busybox/udhcpc.script: ensure action argument is correctly passed to hook scripts

Browse Source 
commit f79a420825 (package/busybox/udhcpc.script: support RFC3442
static routes) used 'set --' clobbering the positional arguments, causing
the action argument to not be correctly forwarded to hook scripts for the
renew / bound cases if static routes are provided by the server.

As a workaround, save the action argument at the beginning of the script and
use that when calling hook scripts.

Reported-by: 王琦 <wangwangqi2011@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 94c41eef61)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2021-08-17 12:19:22 +02:00
parent 14e07eb7b2
commit 6bb11a7721
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/busybox/udhcpc.script
View File

@@ -4,6 +4,7 @@
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
ACTION="$1"
RESOLV_CONF="/etc/resolv.conf" RESOLV_CONF="/etc/resolv.conf"
[ -e $RESOLV_CONF ] || touch $RESOLV_CONF [ -e $RESOLV_CONF ] || touch $RESOLV_CONF
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
@@ -29,7 +30,7 @@ wait_for_ipv6_default_route() {
printf " timeout!\n" printf " timeout!\n"
} }
case "$1" in case "$ACTION" in
deconfig) deconfig)
/sbin/ifconfig $interface up /sbin/ifconfig $interface up
/sbin/ifconfig $interface 0.0.0.0 /sbin/ifconfig $interface 0.0.0.0
@@ -115,7 +116,7 @@ esac
HOOK_DIR="$0.d" HOOK_DIR="$0.d"
for hook in "${HOOK_DIR}/"*; do for hook in "${HOOK_DIR}/"*; do
[ -f "${hook}" -a -x "${hook}" ] || continue [ -f "${hook}" -a -x "${hook}" ] || continue
"${hook}" "${@}" "${hook}" "$ACTION"
done done
exit 0 exit 0