Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-27 08:29:33 +00:00
Code Issues Projects Releases Wiki Activity

ifupdown: %client%, not %clientid%

Browse Source 
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2010-09-03 16:58:37 +02:00
parent 3926363214
commit 2ab3acb274
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
networking/ifupdown.c
View File

@ -483,7 +483,7 @@ struct dhcp_client_t {
static const struct dhcp_client_t ext_dhcp_clients[] = { static const struct dhcp_client_t ext_dhcp_clients[] = {
{ "dhcpcd", { "dhcpcd",
"dhcpcd[[ -h %hostname%]][[ -i %vendor%]][[ -I %clientid%]][[ -l %leasetime%]] %iface%", "dhcpcd[[ -h %hostname%]][[ -i %vendor%]][[ -I %client%]][[ -l %leasetime%]] %iface%",
"dhcpcd -k %iface%", "dhcpcd -k %iface%",
}, },
{ "dhclient", { "dhclient",
@ -495,7 +495,7 @@ static const struct dhcp_client_t ext_dhcp_clients[] = {
"pump -i %iface% -k", "pump -i %iface% -k",
}, },
{ "udhcpc", { "udhcpc",
"udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %clientid%]]" "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %client%]]"
"[[ -s %script%]][[ %udhcpc_opts%]]", "[[ -s %script%]][[ %udhcpc_opts%]]",
"kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null",
}, },
@ -535,7 +535,7 @@ static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec)
return 0; return 0;
#endif #endif
return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid " return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid "
"-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]][[ %udhcpc_opts%]]", "-i %iface%[[ -H %hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]",
ifd, exec); ifd, exec);
} }
#else #else