-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2008-11-11 13:38:53 UTC
-
Revision ID:
james.westby@ubuntu.com-20081111133853-dhorb4x93lab3qm4
Tags: 3.1.1-5ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
- Deroot server (Debian #308832)
+ droppriv.dpatch, deroot-server.dpatch: Code changes.
+ debian/control: Add libcap-dev build dependency.
+ debian/dhcp3-server.postinst: Create dhcpd system user.
+ debian/dhcp3-server.init.d: Create paths with appropriate permissions
for dhcpd system user access.
- Send hostname to DHCP server by default (LP #10239, Debian #151820):
+ debian/patches/dynamic-hostname.dpatch: Add support for a new string
type 'h' which behaves like 't' except that '<hostname>' is changed to
the current hostname. Change 'host-name' DHCP option type from 't' to 'h'.
+ debian/dhclient.conf: Enable send-hostname by default.
- dhclient-onetry-call-clientscript.dpatch: Call 'dhclient-script FAIL'
when failing to get an address also when operating in oneshot mode (-1).
This fixes avahi-autoipd invocation through dhcdbd. (Debian #486520)
- debian/patches/dhcpd.conf-subnet-examples.dpatch: Give an example for
subnet-mask in dhcpd.conf. (LP #26661)
- dhclient-more-debug.dpatch: Show the requested/offered client IP in log
output, for better debugging. (LP #35265, Debian #486611)
- debian/dhclient-script.linux: Wait for /etc/resolv.conf to become
writable; this isn't the case when udev's 85-ifupdown.rules calls ifup
early. (Ubuntu specific until Debian uses this rule, too)
- revert-next-server.dpatch: Revert the need of the next-server option in
dhcpd.conf so it points to the own IP again for tftp if the option is not
set. (Patch by Oliver Grawert; disputed upstream)
- debian/dhcp3-server.init.d: Allow LTSP to override default configuration
in /etc/ltsp/dhcpd.conf. Point that out in a header comment in
debian/dhcpd.conf. (Ubuntu specific)
- debian/dhcp3-server.config: Drop debconf question to medium. (Ubuntu
specific)
- debian/rules: Enable build hardening. Add hardening-wrapper build
dependency. (Ubuntu specific)
* debian/dhclient-script.linux: Drop keeping of old search/domain values if
we didn't get any from the DHCP response. It is inconsistent with
resolvconf and should rather use default/supercede options in
/etc/dhcp3/dhclient.conf. (see Debian #486535)