-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2009-11-12 03:39:44 UTC
-
mfrom:
(0.1.8 sid)
-
Revision ID:
james.westby@ubuntu.com-20091112033944-59lnmufm0dkxrse1
Tags: 1.51ubuntu1
* Resynchronise with Debian. Remaining changes:
- Set default hostname to 'ubuntu'.
- Drop priority of netcfg/get_domain to medium for non-static
configurations.
- Use 'auto <interface>' for all interfaces, dropping allow-hotplug
which doesn't work with current udev.
- Call /usr/lib/network-manager/ifblacklist_migrate.sh from
finish-install if present, so that 'auto dhcp' interfaces are disabled
if network-manager is in use. May be preseeded away with
netcfg/network-manager.
- Bump the DHCP timeout to 30 seconds.