emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udhcpc6: use a different default config script

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2022-12-15 11:51:16 +01:00
parent 301ef96892
commit 242d056230
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
networking/udhcp/Config.src
View File

@ -92,12 +92,17 @@ config FEATURE_UDHCPC_SANITIZEOPT
config UDHCPC_DEFAULT_SCRIPT config UDHCPC_DEFAULT_SCRIPT
string "Absolute path to config script" string "Absolute path to config script"
default "/usr/share/udhcpc/default.script" default "/usr/share/udhcpc/default.script"
depends on UDHCPC || UDHCPC6 depends on UDHCPC
help help
This script is called after udhcpc receives an answer. See This script is called after udhcpc receives an answer. See
examples/udhcp for a working example. Normally it is safe examples/udhcp for a working example. Normally it is safe
to leave this untouched. to leave this untouched.
config UDHCPC6_DEFAULT_SCRIPT
string "Absolute path to config script for IPv6"
default "/usr/share/udhcpc/default6.script"
depends on UDHCPC6
# udhcpc6 config is inserted here: # udhcpc6 config is inserted here:
INSERT INSERT

4
networking/udhcp/d6_dhcpc.c
View File

@ -1134,7 +1134,7 @@ static void client_background(void)
//usage:#define udhcpc6_full_usage "\n" //usage:#define udhcpc6_full_usage "\n"
//usage: "\n -i IFACE Interface to use (default "CONFIG_UDHCPC_DEFAULT_INTERFACE")" //usage: "\n -i IFACE Interface to use (default "CONFIG_UDHCPC_DEFAULT_INTERFACE")"
//usage: "\n -p FILE Create pidfile" //usage: "\n -p FILE Create pidfile"
//usage: "\n -s PROG Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" //usage: "\n -s PROG Run PROG at DHCP events (default "CONFIG_UDHCPC6_DEFAULT_SCRIPT")"
//usage: "\n -B Request broadcast replies" //usage: "\n -B Request broadcast replies"
//usage: "\n -t N Send up to N discover packets" //usage: "\n -t N Send up to N discover packets"
//usage: "\n -T SEC Pause between packets (default 3)" //usage: "\n -T SEC Pause between packets (default 3)"
@ -1200,7 +1200,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
IF_FEATURE_UDHCP_PORT(SERVER_PORT6 = 547;) IF_FEATURE_UDHCP_PORT(SERVER_PORT6 = 547;)
IF_FEATURE_UDHCP_PORT(CLIENT_PORT6 = 546;) IF_FEATURE_UDHCP_PORT(CLIENT_PORT6 = 546;)
client_data.interface = CONFIG_UDHCPC_DEFAULT_INTERFACE; client_data.interface = CONFIG_UDHCPC_DEFAULT_INTERFACE;
client_data.script = CONFIG_UDHCPC_DEFAULT_SCRIPT; client_data.script = CONFIG_UDHCPC6_DEFAULT_SCRIPT;
client_data.sockfd = -1; client_data.sockfd = -1;
/* Make sure fd 0,1,2 are open */ /* Make sure fd 0,1,2 are open */