-
Committer:
Bazaar Package Importer
-
Author(s):
Colin Watson
-
Date:
2008-11-09 17:02:05 UTC
-
mfrom:
(0.1.3 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081109170205-ju22d53nwkl0iyo4
Tags: 1.46ubuntu1
* 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.
- Add an /etc/network/interfaces stanza for lo even if the netcfg menu
item wasn't run.
- Build for lpia.
- Bump the DHCP timeout to 30 seconds.
- If we detect that the user entered a fully-qualified domain name as
the hostname, then remove the domain part from the hostname as well as
copying it to netcfg/get_domain.