summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2010-09-03 16:58:37 +0200
committerDenys Vlasenko2010-09-03 16:58:37 +0200
commit2ab3acb2747f43892641176491b0a0c09f11f086 (patch)
treef311e8dff5bde5f734877db75ac551ad098cded9
parent3926363214bfa783db08c931d867dbf4855d31ef (diff)
downloadbusybox-2ab3acb2747f43892641176491b0a0c09f11f086.zip
busybox-2ab3acb2747f43892641176491b0a0c09f11f086.tar.gz
ifupdown: %client%, not %clientid%
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r--networking/ifupdown.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 5d6994f..864fc2a 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -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