-
Committer:
Bazaar Package Importer
-
Author(s):
Scott James Remnant
-
Date:
2008-11-11 17:15:28 UTC
-
mfrom:
(1.1.3 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081111171528-z6wb7mrlnan9lcff
Tags: 4.34ubuntu1
* Merge from debian unstable, remaining changes:
- introduce flag file for indicating the network has been
configured. This is needed so that ifupdown udev rules does not 'ifup'
the interface too early. Related to LP: #44194
- debian/netbase.init: silence ifup/ifdown if VERBOSE == no
- debian/netbase.init: silence debuging output if VERBOSE == no
- debian/netbase.init: Temporarily increase usplash timeout to 120 seconds
to cope with slop DHCP server responses. LP: #21617