From 2ab3acb2747f43892641176491b0a0c09f11f086 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 3 Sep 2010 16:58:37 +0200 Subject: [PATCH] ifupdown: %client%, not %clientid% Signed-off-by: Denys Vlasenko --- networking/ifupdown.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 5d6994f6e..864fc2acd 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