2ab3acb27
Denys Vlasenko
2010-09-03
Subject
ifupdown: %client%, not %clientid%
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/ifupdown.c+3 -3
| @@ -483,7 +483,7 @@ struct dhcp_client_t { | |
| static const struct dhcp_client_t ext_dhcp_clients[] = { | |
| { "dhcpcd", | |
| - | "dhcpcd[[ -h %hostname%]][[ -i %vendor%]][[ -I %clientid%]][[ -l %leasetime%]] %iface%", |
| + | "dhcpcd[[ -h %hostname%]][[ -i %vendor%]][[ -I %client%]][[ -l %leasetime%]] %iface%", |
| "dhcpcd -k %iface%", | |
| }, | |
| { "dhclient", | |
| @@ -495,7 +495,7 @@ static const struct dhcp_client_t ext_dhcp_clients[] = { | |
| "pump -i %iface% -k", | |
| }, | |
| { "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%]]", | |
| "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; | |
| #endif | |
| 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); | |
| } | |
| #else | |