Package: ifupdown
Version: 0.6.7-0.0.1
Severity: normal
Tags: patch
The dhcp "client" option is broken because of a typo in the source.
Attached is a fix.
I first tried to fix it by changing "client_id" to "client", but it
didn't work unless I made it match the option name. I'm sure there's
a good reason for this that somebody who knows how to use noweb would
understand!
--- ifupdown-0.6.7.orig/ifupdown.nw
+++ ifupdown-0.6.7/ifupdown.nw
@@ -3913,7 +3913,7 @@
leasehours leastime -- Preferred lease time in hours (pump)
leasetime leasetime -- Preferred lease time in seconds (dhcpcd)
vendor vendor -- Vendor class identifier (dhcpcd)
- client client_id -- Client identifier (dhcpcd, udhcpc)
+ client client -- Client identifier (dhcpcd, udhcpc)
hwaddress class address -- Hardware Address. /class/ is one of \
*ether*, *ax25*, *ARCnet* or *netrom*. \
/address/ is dependent on this choice.
@@ -3927,9 +3927,9 @@
pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100))
udhcpc -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
- [[-c %clientid%]] \
+ [[-c %client%]] \
elsif (execable("/sbin/udhcpc") && mylinuxver() >= mylinux(2,2,0))
- dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] \
+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
[[-l %leasetime%]] %iface% \
elsif (execable("/sbin/dhcpcd"))
--- ifupdown-0.6.7.orig/inet.defn
+++ ifupdown-0.6.7/inet.defn
@@ -68,7 +68,7 @@
leasehours leastime -- Preferred lease time in hours (pump)
leasetime leasetime -- Preferred lease time in seconds (dhcpcd)
vendor vendor -- Vendor class identifier (dhcpcd)
- client client_id -- Client identifier (dhcpcd, udhcpc)
+ client client -- Client identifier (dhcpcd, udhcpc)
hwaddress class address -- Hardware Address. /class/ is one of \
*ether*, *ax25*, *ARCnet* or *netrom*. \
/address/ is dependent on this choice.
@@ -82,9 +82,9 @@
pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100))
udhcpc -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
- [[-c %clientid%]] \
+ [[-c %client%]] \
elsif (execable("/sbin/udhcpc") && mylinuxver() >= mylinux(2,2,0))
- dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] \
+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
[[-l %leasetime%]] %iface% \
elsif (execable("/sbin/dhcpcd"))
--
Roderick Schertler
[EMAIL PROTECTED]
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
