~smoser/ubuntu/+source/resolvconf:feature/rooturl-means-copy-dns-trusty

Last commit made on 2017-11-29
Get this branch:
git clone -b feature/rooturl-means-copy-dns-trusty https://git.launchpad.net/~smoser/ubuntu/+source/resolvconf
Only Scott Moser can upload to this branch. If you are Scott Moser please log in for upload directions.

Branch merges

Branch information

Name:
feature/rooturl-means-copy-dns-trusty
Repository:
lp:~smoser/ubuntu/+source/resolvconf

Recent commits

061d5e9... by Scott Moser

ppa0

6203fd7... by Scott Moser

update changelog

4ff7587... by Scott Moser

accept root=http to indicate desired dns functionality

(cherry picked from commit 80d242533e09446d341830c0efd44fd0a329edc3)

4e1f6ef... by Scott Moser

Import version 1.69ubuntu1.3 with git-import-dsc

  * Fix bad shell syntax in newly added
    /lib/resolvconf/net-interface-handler (LP: #1711760)

LP: #1711760

a543ed6... by Scott Moser

Import version 1.69ubuntu1.2 with git-import-dsc

  * support reading dns information written by initramfs. (LP: #1711760)

LP: #1711760

bdf6447... by Timo Jyrinki

Import patches-unapplied version 1.69ubuntu1.1 to ubuntu/trusty-proposed

Imported using usd-importer.

Publish parent: d5264c77bb6a7998a5b532963e4380ff867fb851

New changelog entries:
  * debian/preinst: On 12.04 LTS the system works without /etc/resolv.conf.
    Upon upgrading such a system to 14.04 LTS network stops working.
    Therefore, create a symlink upon upgrade from resolvconf <= 1.64 in the
    case that /etc/resolv.conf does not exist at all. (LP: #1308378)

d5264c7... by Stéphane Graber

Import patches-unapplied version 1.69ubuntu1 to ubuntu/trusty

Imported using usd-importer.

Publish parent: 4738d7aa202c4765389b3eb909402fea7b660d53

4738d7a... by Stéphane Graber

Import patches-unapplied version 1.69ubuntu1 to ubuntu/saucy

Imported using usd-importer.

Publish parent: b4160d0172b8ba84dce7f1a5b539116d77bca95b

b4160d0... by Stéphane Graber

Import patches-unapplied version 1.69ubuntu1 to ubuntu/raring

Imported using usd-importer.

Publish parent: 2cb8de840d8280f7aa64208fa1ef3267f875b5ba
Changelog parent: 4eaa0d7b6149d254e46d2b7c03acca2ebb4d52ab

4eaa0d7... by Stéphane Graber

Import patches-unapplied version 1.69ubuntu1 to ubuntu/raring-proposed

Imported using usd-importer.

Publish parent: 5e24bcd7fb231a4ed57fb653ca04a0f96ca2e4d7
Changelog parent: 4c3ebaeaac26d9d3549a34fa9787427ab19b68bd

New changelog entries:
  * Merge from Debian. Remaining changes: (LP: #1085756)
    - Make /etc/resolv.conf a relative symlink so that it works when
      setting up chroots.
    - Instead of throwing an error that aborts the upgrade when
      /etc/resolv.conf is immutable, pop a debconf error message to let the
      user know what's happening, then clear the immutable flag and continue
      with the installation. LP: #989585.
    - debian/config, debian/templates, debian/postinst: if we don't know that
      /etc/resolv.conf was being dynamically managed before install (in at
      least some cases), link the original contents of /etc/resolv.conf to
      /etc/resolvconf/resolv.conf.d/tail so that any statically configured
      nameservers aren't lost. LP: #923685.
    - Use an upstart job instead of sysvinit script.
    - Pre-Depend on the /run-providing version of initscripts instead of
      depending, so that the preinst does the right thing when creating
      /run/resolvconf/interfaces instead of getting clobbered later by a bind
      mount on initscripts upgrade. LP: #922491.
    - Completely drop the standard_run_subdirs_created helper function from
      debian/postinst, since it serves no purpose here.
    - postinst: Set resolvconf/linkify-resolvconf to false after initial
      conversion, ensuring upgrades won't convert /etc/resolv.conf to
      a symlink if the user manually converted it back to plain text.
      (LP: #922677)
    - Move the #DEBHELPER# token in debian/postinst to after the resolv.conf
      symlink is set, so the init script can actually start (since it expects
      /etc/resolv.conf to be a symlink).
    - 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.
    - Also remove debian/triggers to avoid needlessly calling resolvconf's
      postinst. (LP: #931335)
  * Fix previous mis-merge of debian/postinst as well as the few other comments
    from the bug report. (LP: #1085862)