~ubuntu-branches/ubuntu/hardy/ifupdown/hardy

« back to all changes in this revision

Viewing changes to inet.defn

  • Committer: Package Import Robot
  • Author(s): Alexander Sack
  • Date: 2007-09-20 00:38:33 UTC
  • Revision ID: package-import@ubuntu.com-20070920003833-zpw27pfvyfl5p0jg
ifupdown.nw: use 100 as default route metric unless an explicit metric
parameter is set in /etc/network/interface; this applies for static and
dhcp interfaces and passes the -e IF_METRIC=%metric% option to dhclient{3}
in order to accomplish this. For details see the launchpad bug
(LP: #139403).

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
 
76
76
  up
77
77
    [[ifconfig %iface% hw %hwaddress%]]
78
 
    dhclient3 -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
 
78
    dhclient3 [[-e IF_METRIC=%metric%]] -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
79
79
        if (execable("/sbin/dhclient3"))
80
 
    dhclient -e -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
 
80
    dhclient [[-e IF_METRIC=%metric%]] -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
81
81
        elsif (execable("/sbin/dhclient"))
82
82
    pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
83
83
        elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100))