Last commit made on 2015-06-01
Get this branch:
git clone -b ubuntu/wily-devel https://git.launchpad.net/ubuntu/+source/resolvconf
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

59e400c... by Martin Pitt on 2015-06-01

Import patches-unapplied version 1.77ubuntu1 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: bcdd3b70fe08e54aa5895d8f92a9f15f94e7bf5d

New changelog entries:
  * Merge with Debian unstable. Remaining Ubuntu changes:
    - debian/postinst: Make /etc/resolv.conf a relative symlink so that it
      works when setting up chroots.
    - Eliminate all references to /etc/resolvconf/run. This should all be done
      directly in /run, there is no reason to support making any of this
      configurable with a symlink since we already have a versioned dependency
      on the version of initscripts that introduces the /run transition.
  * Clean up some merge delta, thanks to Thomas Hood for reviewing!
    - Put back debian/triggers (should have been re-added as part of fixing
      LP #1453185)
    - Drop symlink check in dhclient-enter-hooks.d/resolvconf, to avoid
      dhclient overwriting /etc/resolv.conf when resolvconf is installed.
      (LP: #1385010)
    - resolvconf/link-tail-to-original debconf question again defaults to
      false; it's rather irrelevant as we install resolvconf by default.

bcdd3b7... by Thomas Hood on 2015-04-21

Import patches-unapplied version 1.77 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c49074b04f699849c5c90cc00774506aa2a948fe

New changelog entries:
  * [0781847] interface-order: match br ifaces at the same
    priority as eth ifaces (see LP#1446681)
  * Remove obsolete upgrade code
  * [00ad4bf] Override immutability attrib on /etc/resolv.conf
    if dnssec-trigger is installed. See #776778 for background.

c49074b... by Thomas Hood on 2015-01-23

Import patches-unapplied version 1.76.1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 634033f48d18b7dfb44a8a7714a007449b12128e

New changelog entries:
  * [eb81ca0] Eliminate bashisms.
    Thanks to Michael Gilbert (Closes: #775356)

634033f... by Thomas Hood on 2014-10-10

Import patches-unapplied version 1.76 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 4bd95ab14b9e1851691ff49056126f531610e1ae

New changelog entries:
  * resolvconf.service: Install into sysinit.target, not into
    network.target (Closes: #749405)
    Thanks to Martin Pitt and Edward Allcutt
  * [c405030] Add exclusion for L2TP VPN plugin (LP#1349011)
  * [4cbd73d] Bump Standards-Version

4bd95ab... by Thomas Hood on 2014-05-08

Import patches-unapplied version 1.75 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8db174974a8e8d29bb2fcc6eed39f542a81b117e

New changelog entries:
  * [49dedb8] Update man page re: "dns-nameserver" (Closes: 718021)
  * [6195584] Don't give update-rc.d start and stop (Closes: #718232)
  * [eed7eb1] Add pt_BR.po. Thanks to A. R. Gomes (Closes: #718714)
  * [a84a8f2] Remove buggy dnscache update script which should be in
              dnscache-run anyway
  * [b93b150] Fix typo in README (Closes: #737158)
  * [6a47a50] Add systemd unit. Thanks Martin Pitt (Closes: #700846)

8db1749... by Thomas Hood on 2013-07-20

Import patches-unapplied version 1.74 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5a0308da97fe8564ba231999b5d9bd6cf37f6f37

New changelog entries:
  * [bb84ffc] Tweak the README:
  * [e3910a7] Recommend use of 'dns-nameserver'.
              No longer mention the useless deprecated 'dns-domain'.
  * [2fe6083] Add dump-debug-info script
  * [b24b66d] Add "--after" option to list-records

5a0308d... by Marco Nenciarini on 2013-07-02

Import patches-unapplied version 1.73 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e876ed2d3402288a6e598cabded631052ef9b1eb

New changelog entries:
  [ Thomas Hood ]
  * [a55738e] Update README; mention unbound's resolvconf support
  * [8da8cf7] Move flag file to /var/lib/resolvconf (Closes: #710957)
  * [e2b2026] Update ja.po. Thanks to Victory. (Closes: #712921)
  * [d727533] Use init_is_upstart
  [ Marco Nenciarini ]
  * [44f6d68] Canonicalize VCS-* field URI in debian/control

e876ed2... by Thomas Hood on 2013-05-08

Import patches-unapplied version 1.72 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 4e3689a83500c267d15cb986cd93e748acf70860

New changelog entries:
  * [d3b9390] Fix flag file name in debian/config

4e3689a... by Thomas Hood on 2013-03-25

Import patches-unapplied version 1.71 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ff728a72821c49ecfe3e6c9002932704923dd897

New changelog entries:
  [ Thomas Hood ]
  * [7e4b50a] Accept multiple "dns-nameserver" options in /e/n/i,
      allowing at most one address per option line. Requires Jessie.
  * [cd7f88b] Simplify maintainer scripts: no longer handle upgrading
      from Squeeze; Pre-Depend on Wheezy version of initscripts.
  * [68654a4] Only linkify once; our memory that we have linkified is
      the existence of file /etc/resolvconf/do-not-linkify-resolvconf
      which can of course be created or deleted by the admin. *Do*
      linkify on dpkg-reconfigure --- same behavior as in Ubuntu but
      implemented without changing debconf answers.
  * [27551b1] Add Upstart job file from Ubuntu
  * [9b72d0e] resolvconf: Remove the *-runtime-directories options
      which were intended to ease maintenance when the Debian and
      Ubuntu versions were being maintained together. Now that the
      Ubuntu package is maintained separately and makes no use of
      these options, their raison d'ĂȘtre has vanished. Transfer the
      underlying code to the initscript and to the Upstart job file.
  * [9b854f8] if-down.d/resolvconf: Drop workaround for fixed #338348
  * [27f6103] Remove refs to totd which has been removed from Debian
  * [06a14e1] Update README

ff728a7... by Thomas Hood on 2013-02-06

Import patches-unapplied version 1.70 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0125b1e9c005bc45644733c68aabeb9066317a8a

New changelog entries:
  [ Thomas Hood ]
  * [ec06f8d] Add NEWS item about the "bind" update script being
      disabled (Closes: #697435)
  * [ec06f8d] Change interface-order such that it more consistently
      prioritizes IPv6 records over IPv4 records and ifup records over
      DHCP-client records (Fixes LP#1094345). N.B., previously
      "eth0.inet" had lower priority than "eth0.dhclient" had, and now
      has higher priority. So now a dns-nameservers option in an
      "inet dhcp" stanza in /etc/network/interfaces can be used to
      override a bad IPv4 server address coming in via DHCP
      (Closes: #513445)
  * [9e26ca4] Drop DM-Upload-Allowed
  * [0863189] Use ifquery instead of "grep /e/n/i" in
      debian/config. Because of need for ifquery, add versioned
      Dependency on ifupdown. Instigated by debian-devel thread:
  * [eef5e1c] update.d/libc: Don't restart nscd any more. Nscd now
      spontaneously re-reads resolv.conf when it changes
      (Fixes LP#1110331). This shouldn't have much effect since nscd's
      hosts cache was disabled by default in 2007 and restarting
      nscd unnecessarily did no harm.
  * [f559774] resolvconf.8: Undocument the now-deprecated
      *-runtime-directories options and mention that static resolver
      options should be migrated to resolv.conf.d/base.
  * [396e5b1] resolvconf.8: Remove the statement, no longer true in
      Jessie, that an option can only be used once per /e/n/i stanza.