Branches for Trusty

Author: Colin Watson
Revision Date: 2014-09-23 20:38:54 UTC

Fix BOOTIF detection to handle the newline at the end of a line read
from /proc/cmdline (LP: #1350302).

Author: Colin Watson
Revision Date: 2014-09-23 20:38:54 UTC

Fix BOOTIF detection to handle the newline at the end of a line read
from /proc/cmdline (LP: #1350302).

Author: Colin Watson
Revision Date: 2014-04-03 14:46:49 UTC

* Resynchronise with Debian. Remaining changes:
  - Set default hostname to 'ubuntu'.
  - Set priority for get_domain to high for static configurations.
  - Set priority for get_domain to medium for non-static configurations.
  - Use 'auto <interface>' for all interfaces, dropping allow-hotplug
    which doesn't work with current udev.
  - Set DHCP and DHCPv6 timeout to 30s.
  - Use isc-dhcp-client-udeb on all architectures.
  - Flush all addresses and routes before configuring interfaces
    (LP: #848072)
  - Don't copy /etc/resolv.conf to target if resolvconf is installed.
    (We already write resolvconf configuration to /etc/network/interfaces.)
  - Add a post-base-install hook to detect resolvconf and copy
    /run/resolvconf/resolv.conf to outside the target so that when /run
    is bind-mounted DNS resolving continues to work. (LP: #926447)
  - Apply patch from Alec Warner making netcfg respect netcfg/dhcpv6_timeout
    and running dhclient in one-shot mode (-1). (LP: #917905)
  - Fix FTBFS by checking the return value of fgets and fscanf.
  - Fix nm-conf to generate a valid NetworkManager static configuration file.