-
Committer:
Bazaar Package Importer
-
Author(s):
Colin Watson
-
Date:
2011-02-08 13:00:39 UTC
-
mfrom:
(0.1.17 sid)
-
Revision ID:
james.westby@ubuntu.com-20110208130039-1hyjbyaummrxekhg
Tags: 1.60ubuntu1
* 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.
- Strip trailing dots from domain when writing to /etc/hosts.