package/busybox/udhcpc.script: ensure action argument is correctly passed to hook scripts
commitf79a420825
(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 commit94c41eef61
) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
14e07eb7b2
commit
6bb11a7721
@ -4,6 +4,7 @@
|
||||
|
||||
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
|
||||
|
||||
ACTION="$1"
|
||||
RESOLV_CONF="/etc/resolv.conf"
|
||||
[ -e $RESOLV_CONF ] || touch $RESOLV_CONF
|
||||
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
|
||||
@ -29,7 +30,7 @@ wait_for_ipv6_default_route() {
|
||||
printf " timeout!\n"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
case "$ACTION" in
|
||||
deconfig)
|
||||
/sbin/ifconfig $interface up
|
||||
/sbin/ifconfig $interface 0.0.0.0
|
||||
@ -115,7 +116,7 @@ esac
|
||||
HOOK_DIR="$0.d"
|
||||
for hook in "${HOOK_DIR}/"*; do
|
||||
[ -f "${hook}" -a -x "${hook}" ] || continue
|
||||
"${hook}" "${@}"
|
||||
"${hook}" "$ACTION"
|
||||
done
|
||||
|
||||
exit 0
|
||||
|
Loading…
Reference in New Issue
Block a user