~ubuntu-branches/ubuntu/oneiric/isc-dhcp/oneiric-updates

« back to all changes in this revision

Viewing changes to debian/debug-exit

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-05-30 13:30:57 UTC
  • mfrom: (11.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20110530133057-37fc4uvxkklqpdtr
Tags: 4.1.1-P1-17ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Deroot server (Debian #308832).
  - Send hostname to DHCP server by default (LP #10239, Debian #151820).
  - 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.
  - dhcpd.conf-subnet-examples.dpatch: Give an example for subnet-mask in
    dhcpd.conf.
  - dhclient-more-debug.dpatch: Show the requested/offered client IP in
    log output, for better debugging.
  - debian/dhclient-script.linux: Wait for /etc/resolv.conf to become
    writable; this isn't the case when ifup is called from an Upstart job
    triggered by udev (Ubuntu-specific until Debian uses this rule, too).
    Rewritten for 4.1.1-P1-17 changes.
  - 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/isc-dhcp-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/isc-dhcp-server.config: Drop debconf question to medium
    (Ubuntu-specific).
  - Enable build hardening.  Add hardening-wrapper build dependency
    (Ubuntu-specific).
  - Add enforcing AppArmor profile for DHCP client and server.
  - Install apport hooks.
  - debian/dhclient-script.linux: Fix regression in host_name option
    handling, so that it's always honored when /etc/hostname is not set.
  - dhclient-fix-backoff.dpatch,
    dhclient-initial-random-delay-option.dpatch: Speed up DHCP negotiation
    (Debian #509089).
  - Fix configure test for ber_init to work correctly with 'ld
    --no-add-needed'.
  - isc-dhcp-client Breaks: network-manager (<< 0.8.2~rc1), since earlier
    versions were patched in Ubuntu to hardcode assumptions for
    dhcp3-client.
  - debian/patches/multi-ip-addr-per-if.dpatch: Resolve issue of
    interfaces not being able to have more than one IP address assigned.
  - debian/isc-dhcp-client.links: fix symlink ordering for new ISC
    package
  - debian/rules: add call to dh_link to get package symlinks back

Show diffs side-by-side

added added

removed removed

Lines of Context:
13
13
        echo `date`: entering dhclient-exit-hooks.d, dumping variables. \
14
14
                >> /tmp/dhclient-script.debug
15
15
 
16
 
        for i in reason interface medium alias_ip_address new_ip_address \
17
 
                        new_subnet_mask new_domain_name new_domain_search \
18
 
                        new_domain_name_servers new_routers new_static_routes \
19
 
                        old_ip_address old_subnet_mask old_domain_name \
20
 
                        old_domain_search old_domain_name_servers old_routers \
21
 
                        old_static_routes; do
22
 
                echo $i=\'${!i}\' >> /tmp/dhclient-script.debug
 
16
        # loop over the 4 possible prefixes: (empty), cur_, new_, old_
 
17
        for prefix in '' 'cur_' 'new_' 'old_'; do
 
18
                # loop over the DHCP variables passed to dhclient-script
 
19
                for basevar in reason interface medium alias_ip_address \
 
20
                               ip_address host_name network_number subnet_mask \
 
21
                               broadcast_address routers static_routes \
 
22
                               rfc3442_classless_static_routes \
 
23
                               domain_name domain_search domain_name_servers \
 
24
                               netbios_name_servers netbios_scope \
 
25
                               ntp_servers \
 
26
                               ip6_address ip6_prefix ip6_prefixlen \
 
27
                               dhcp6_domain_search dhcp6_name_servers ; do
 
28
                        var="${prefix}${basevar}"
 
29
 
 
30
                        if [ -n "${!var}" ]; then
 
31
                                echo "$var='${!var}'" >> /tmp/dhclient-script.debug
 
32
                        fi
 
33
                done
23
34
        done
24
35
 
25
36
        echo '--------------------------' >> /tmp/dhclient-script.debug