lp:ubuntu/raring-proposed/resolvconf

Created by Ubuntu Package Importer and last modified
Get this branch:
bzr branch lp:ubuntu/raring-proposed/resolvconf
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Development

Recent revisions

85. By Stéphane Graber

* 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)

84. By Stéphane Graber

* Merge from Debian. Remaining changes:
  - 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)

83. By Stéphane Graber

releasing version 1.68ubuntu1

82. By Stéphane Graber

Merge from Debian

81. By Stéphane Graber

releasing version 1.67ubuntu2

80. By Stéphane Graber

Fix ppp hooks to also apply to modem connections under NM.

79. By Stéphane Graber

Remove remaining /etc/resolvconf/run reference.

78. By Stéphane Graber

releasing version 1.67ubuntu1

77. By Stéphane Graber

Remove unused -standard_run_subdirs_created function and remove duplicate DEBHELPER tag

76. By Stéphane Graber

Remove error when /etc/resolv.conf isn't a symlink. This is now handled by the libc updater

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/raring/resolvconf
This branch contains Public information 
Everyone can see this information.

Subscribers