Merge lp:~vorlon/ubuntu/precise/resolvconf/lp.989585 into lp:ubuntu/precise/resolvconf

[Steve Langasek]

Proposed fix for immutable handling in resolvconf. The debconf template
could use some review.

[Kees Cook (kees)]

review: Approve

[lp:~vorlon/ubuntu/precise/resolvconf/lp.989585]

63. By Steve Langasek on 2012-05-02

Adjust the debconf template based on feedback from Barry. Thanks for the
review\!

64. By Steve Langasek on 2012-05-02

releasing version 1.63ubuntu12

65. By Stéphane Graber on 2012-05-03

Merge from Debian unstable

66. By Stéphane Graber on 2012-05-04

releasing version 1.65ubuntu1

67. By Steve Langasek on 2012-05-06

Fix syntax of db_input command, which is part of why we're seeing
failures in bug #994539.

[Julian Andres Klode (juliank)]

Cleaning up merge proposal queue

Unmerged revisions

67. By Steve Langasek on 2012-05-06

Fix syntax of db_input command, which is part of why we're seeing
failures in bug #994539.

66. By Stéphane Graber on 2012-05-04

releasing version 1.65ubuntu1

65. By Stéphane Graber on 2012-05-03

Merge from Debian unstable

64. By Steve Langasek on 2012-05-02

releasing version 1.63ubuntu12

63. By Steve Langasek on 2012-05-02

Adjust the debconf template based on feedback from Barry. Thanks for the
review\!

62. By Steve Langasek on 2012-04-27

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.

=== modified file 'bin/resolvconf'
--- bin/resolvconf	2012-02-20 19:15:28 +0000
+++ bin/resolvconf	2012-05-06 19:31:17 +0000
@@ -69,9 +69,12 @@
 	exit 0
 	;;
   --wipe-runtime-directories)
-	# Delete everything in the main run directory (target) but not the directory itself
+	# Delete files in the resolvconf run directory (target) but not the directory itself
 	[ -d "$RUN_DIR" ] || exit 0
-	rm -rf "$RUN_DIR"/*
+	rm -f "$RUN_DIR"/resolv.conf
+	rm -f "$ENABLE_UPDATES_FLAGFILE"
+	rm -f "$POSTPONED_UPDATE_FLAGFILE"
+	rm -rf "$IFACE_DIR"
 	exit 0
 	;;
 esac
 
=== removed file 'debian/NEWS'
--- debian/NEWS	2010-07-12 12:41:37 +0000
+++ debian/NEWS	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-resolvconf (1.46) unstable; urgency=low
-
-  In the future the dhclient program will be shipped not in the
-  dhcp3-client package but in the isc-dhcp-client package.  The
-  latter version of dhclient will read its configuration from
-  /etc/dhcp/ rather than from /etc/dhcp3/.  Consequently, in order
-  to support the new version of dhclient, this resolvconf package
-  includes hook script /etc/dhcp/dhclient-enter-hooks.d/resolvconf
-  which currently has the same contents as the old dhclient hook
-  script /etc/dhcp3/dhclient-enter-hooks.d/resolvconf.  If you have
-  made local changes to /etc/dhcp3/dhclient-enter-hooks.d/resolvconf
-  and you plan to install the isc-dhcp-client package then you
-  should consider making similar changes to
-  /etc/dhcp/dhclient-enter-hooks.d/resolvconf.
-
- -- Thomas Hood <[e-mail]>  Fri, 18 Jun 2010 09:19:00 +0200
-
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-29 20:40:06 +0000
+++ debian/changelog	2012-05-06 19:31:17 +0000
@@ -1,6 +1,87 @@
+resolvconf (1.65ubuntu2) UNRELEASED; urgency=low
+
+  * Fix syntax of db_input command, which is part of why we're seeing
+    failures in bug #994539.
+
+ -- Steve Langasek <[e-mail]>  Sun, 06 May 2012 12:28:09 -0700
+
+resolvconf (1.65ubuntu1) quantal; urgency=low
+
+  * Merge from debian unstable. 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)
+    - Make resolvconf exit 0 when /etc/resolv.conf isn't a symlink
+      (instead of exit 1) and update the error message.
+    - 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.
+
+ -- Stéphane Graber <[e-mail]>  Thu, 03 May 2012 21:17:35 -0400
+
+resolvconf (1.65) unstable; urgency=low
+
+  [ Thomas Hood ]
+  * [3f0a1a1] Create /etc/resolvconf/run and its target and subdir
+    in the postinst as well as in the preinst (Closes: #662724)
+  * [ae16ea8] In postinst, as last resort, create /run/resolvconf/
+     even if /run isn't a tmpfs.
+  * [25711bf] ifupdown hook scripts: Don't return error to ifupdown
+    (Addresses #661591 so far as resolvconf is concerned)
+  * [8da29c3] Document that list-records doesn't list empty records.
+    Add patterns for biosdevnames (See LP#949473)
+  * [a998de3] Update default interface order patterns in list-records
+  * [94baf61] resolvconf(8): Update ref to dhclient hook script
+    (See LP#953257)
+
+ -- Thomas Hood <[e-mail]>  Tue, 13 Mar 2012 09:09:35 +0100
+
+resolvconf (1.64) unstable; urgency=low
+
+  [ Thomas Hood ]
+  * [da2bfa4] Wipe more selectively (Closes: #657259)
+  * [e5fbaef] Ubuntu backport: on enable-updates, exit with nonzero
+    status if and only if updates could not be enabled (i.e., ignore
+    update script errors).
+  * [e1cb96e] Bump Standards-Version
+
+ -- Marco Nenciarini <[e-mail]>  Sun, 04 Mar 2012 17:44:13 +0100
+
+resolvconf (1.63ubuntu12) precise-proposed; urgency=low
+
+  * 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.
+
+ -- Steve Langasek <[e-mail]>  Wed, 02 May 2012 12:51:50 -0700
+
 resolvconf (1.63ubuntu11) precise; urgency=low
 
-  * debian/config: Update regexp toallow multiple DNS servers on a single
+  * debian/config: Update regexp to allow multiple DNS servers on a single
     dns-nameservers line.
 
  -- Stéphane Graber <[e-mail]>  Thu, 29 Mar 2012 16:38:31 -0400
 
=== modified file 'debian/control'
--- debian/control	2012-01-27 22:13:55 +0000
+++ debian/control	2012-05-06 19:31:17 +0000
@@ -9,11 +9,11 @@
 Vcs-Git: git://git.debian.org/git/resolvconf/resolvconf.git
 Vcs-Browser: http://git.debian.org/?p=resolvconf/resolvconf.git
 DM-Upload-Allowed: yes
-Standards-Version: 3.9.2.0
+Standards-Version: 3.9.3
 
 Package: resolvconf
 Architecture: all
-Enhances: isc-dhcp-client, dhcpcd, pump, udhcpc, ppp, ifupdown, network-manager, bind9, dnsmasq, pdnsd, totd, libc6, nscd
+Enhances: isc-dhcp-client, dhcpcd, pump, udhcpc, ppp, ifupdown, network-manager, dnsmasq, pdnsd, totd, libc6, nscd
 Depends: lsb-base, ${misc:Depends}
 Pre-Depends: initscripts (>= 2.88dsf-13.10)
 Breaks: dnscache-run, dhcp3-client (<< 4.1.1-P1-15+squeeze1)
 
=== modified file 'debian/copyright'
--- debian/copyright	2011-12-17 23:25:04 +0000
+++ debian/copyright	2012-05-06 19:31:17 +0000
@@ -1,9 +1,12 @@
-Copyright © 2003-2011, Thomas Hood.  All rights reserved.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+Files: *
+Copyright: Copyright 2003-2012 Thomas Hood <[e-mail]>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
 
=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2012-01-02 07:57:48 +0000
+++ debian/po/cs.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.56\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-06-15 15:02+0200\n"
 "Last-Translator: Miroslav Kure <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
@@ -28,16 +28,16 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Balík resolvconf obsahuje infrastrukturu vyžadovanou pro dynamické "
 "aktualizace konfigura�ního souboru resolveru. Sou�ástí infrastruktury je i "
-"symbolický odkaz z /etc/resolv.conf na /run/resolvconf/resolv.conf. "
-"Pokud budete souhlasit, odkaz se vytvoří automaticky. Stávající /etc/resolv."
-"conf bude zachován jako /etc/resolvconf/resolv.conf.d/original a při "
-"odstranění balíku bude obnoven."
+"symbolický odkaz z /etc/resolv.conf na /run/resolvconf/resolv.conf. Pokud "
+"budete souhlasit, odkaz se vytvoří automaticky. Stávající /etc/resolv.conf "
+"bude zachován jako /etc/resolvconf/resolv.conf.d/original a při odstranění "
+"balíku bude obnoven."
 
 #. Type: boolean
 #. Description
@@ -187,3 +187,38 @@
 "Až do souboru /etc/network/interfaces přidáte požadované řádky „dns-"
 "nameservers“, měli byste přesměrovat symbolický odkaz /etc/resolvconf/resolv."
 "conf.d/tail na /dev/null."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/da.po'
--- debian/po/da.po	2012-01-02 07:57:48 +0000
+++ debian/po/da.po	2012-05-06 19:31:17 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.56\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-06-12 17:30+01:00\n"
 "Last-Translator: Joe Hansen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]> \n"
@@ -30,9 +30,9 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Pakken resolvconf indeholder infrastrukturen krævet for dynamisk opdatering "
 "af klarlæggerkonfigurationsfilen (»resolver«). En del af den nødvendige "
@@ -195,3 +195,38 @@
 "Efter de krævede »dns-nameservers«-linjer er blevet tilføjet til /etc/"
 "network/interfaces, bør henvisningen /etc/resolvconf/resolv.conf.d/tail "
 "erstattes med en i /dev/null."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/de.po'
--- debian/po/de.po	2012-01-02 07:57:48 +0000
+++ debian/po/de.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.55\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-06-04 15:47+0200\n"
 "Last-Translator: Helge Kreutzmann <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
@@ -28,9 +28,9 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Das Paket Resolvconf enthält die für das dynamische Aktualisieren der "
 "Resolver-Konfigurationsdatei benötigte Infrastruktur. Teil der notwendigen "
@@ -196,3 +196,38 @@
 "Nachdem benötigte »dns-nameservers«-Zeilen zu /etc/network/interfaces "
 "hinzugefügt wurden, sollte der symbolische Link von /etc/resolvconf/resolv."
 "conf.d/tail auf /dev/null geändert werden."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/es.po'
--- debian/po/es.po	2012-01-02 07:57:48 +0000
+++ debian/po/es.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.59\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-09-21 23:44+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
@@ -31,17 +31,17 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "El paquete resolvconf incluye la infraestructura necesaria para poder "
 "actualizar de forma dinámica el fichero de configuración de resolución. Un "
-"enlace simbólico de «/etc/resolv.conf» a «/run/resolvconf/resolv.conf» "
-"es parte de la infraestructura necesaria. Si elije esta opción se creará "
-"este enlace. Se preservarán los contenidos del fichero «/etc/resolv.conf» "
-"actual en el fichero «/etc/resolvconf/resolv.conf.d/original» y se "
-"restaurará este archivo si elimina el paquete."
+"enlace simbólico de «/etc/resolv.conf» a «/run/resolvconf/resolv.conf» es "
+"parte de la infraestructura necesaria. Si elije esta opción se creará este "
+"enlace. Se preservarán los contenidos del fichero «/etc/resolv.conf» actual "
+"en el fichero «/etc/resolvconf/resolv.conf.d/original» y se restaurará este "
+"archivo si elimina el paquete."
 
 #. Type: boolean
 #. Description
@@ -84,7 +84,12 @@
 "interface configurers are expected to supply name server information to the "
 "resolvconf program. However, although installation of the resolvconf package "
 "triggers them to supply their information, some of them fail to do so."
-msgstr "Se espera que los proveedores de información de servidores de nombres, como puedan ser servidores de nombres con caché local y los sistemas que configuran las interfaces, de información al programa resolvconf. Sin embargo, aunque la instalación del paquete resolvconf hace que éstos proporcionen esta información, algunos de éstos pueden no darla."
+msgstr ""
+"Se espera que los proveedores de información de servidores de nombres, como "
+"puedan ser servidores de nombres con caché local y los sistemas que "
+"configuran las interfaces, de información al programa resolvconf. Sin "
+"embargo, aunque la instalación del paquete resolvconf hace que éstos "
+"proporcionen esta información, algunos de éstos pueden no darla."
 
 #. Type: note
 #. Description
@@ -97,7 +102,16 @@
 "information is retained even if the associated interface is later "
 "deconfigured. (This incorrect behavior is judged to be less harmful than the "
 "alternative of losing valid information.)"
-msgstr "Este error puede dar lugar a la pérdida de la información de servidores de nombres válidos al instalar el paquete resolvconf si no se adoptar las siguientes medidas de para evitar el problema: resolvconf incluye los contenidos completos del fichero «/etc/resolv.conf» antes de la instalación en su base de datos hasta un reinicio del sistema. Esto tiene el inconveniente de que la información de servidores de nombres se mantiene aún cuando la interfaz asociada se desconfigure (se considera que este comportamiento inválido es menos perjuidicial que la alternativa de perder información válida)."
+msgstr ""
+"Este error puede dar lugar a la pérdida de la información de servidores de "
+"nombres válidos al instalar el paquete resolvconf si no se adoptar las "
+"siguientes medidas de para evitar el problema: resolvconf incluye los "
+"contenidos completos del fichero «/etc/resolv.conf» antes de la instalación "
+"en su base de datos hasta un reinicio del sistema. Esto tiene el "
+"inconveniente de que la información de servidores de nombres se mantiene aún "
+"cuando la interfaz asociada se desconfigure (se considera que este "
+"comportamiento inválido es menos perjuidicial que la alternativa de perder "
+"información válida)."
 
 #. Type: note
 #. Description
@@ -107,7 +121,11 @@
 "to ensure that resolvconf has fully correct name server information after "
 "the resolvconf package has been installed on a running system is to reboot "
 "the system."
-msgstr "Hasta que este error no se haya arreglado y se haya eliminado este arreglo transitorio, la única forma de asegurarse que resolvconf tiene la información correcta de los servidores de nombres después de su instalación es reiniciar el sistema."
+msgstr ""
+"Hasta que este error no se haya arreglado y se haya eliminado este arreglo "
+"transitorio, la única forma de asegurarse que resolvconf tiene la "
+"información correcta de los servidores de nombres después de su instalación "
+"es reiniciar el sistema."
 
 #. Type: note
 #. Description
@@ -116,7 +134,10 @@
 "The removal of the resolvconf package may have resulted in some information "
 "about name servers becoming unavailable. To correct this problem it is "
 "recommended that the system be rebooted."
-msgstr "Es posible que la eliminación del paquete resolvconf haya tenido como resultado la pérdida de alguna información sobre los servidores de nombres. Se recomienda reiniciar el sistema para corregir este problema."
+msgstr ""
+"Es posible que la eliminación del paquete resolvconf haya tenido como "
+"resultado la pérdida de alguna información sobre los servidores de nombres. "
+"Se recomienda reiniciar el sistema para corregir este problema."
 
 #. Type: boolean
 #. Description
@@ -179,3 +200,38 @@
 "Debería reemplazar el enlace simbólico «/etc/resolvconf/resolv.conf.d/tail» "
 "para que sea un enlace a «/dev/null» una vez haya añadido las líneas «dns-"
 "nameservers» necesarias a «/etc/network/interfaces»."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/eu.po'
--- debian/po/eu.po	2012-01-02 07:57:48 +0000
+++ debian/po/eu.po	2012-05-06 19:31:17 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.55\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-06-06 15:34+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <[e-mail]>\n"
 "Language-Team: Basque <[e-mail]>\n"
@@ -31,17 +31,16 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Resolvconf paketeak ebazlearen konfigurazioko fitxategia automatikoki "
 "eguneratzeko beharrezkoa den azpiegitura du. Beharrezko azpiegitura horren "
-"zati bat /etc/resolv.conf fitxategiaren /run/resolvconf/resolv.conf "
-"arteko esteka sinboliko bat da. Aukera hau hautatzean, esteka hori sortuko "
-"da; aurretik dagoen /etc/resolv.conf fitxategia /etc/resolvconf/resolv.conf."
-"d/original izenarekin gordeko da, eta berriz leheneratuko da paketea "
-"kentzean."
+"zati bat /etc/resolv.conf fitxategiaren /run/resolvconf/resolv.conf arteko "
+"esteka sinboliko bat da. Aukera hau hautatzean, esteka hori sortuko da; "
+"aurretik dagoen /etc/resolv.conf fitxategia /etc/resolvconf/resolv.conf.d/"
+"original izenarekin gordeko da, eta berriz leheneratuko da paketea kentzean."
 
 #. Type: boolean
 #. Description
@@ -133,8 +132,8 @@
 "recommended that the system be rebooted."
 msgstr ""
 "resolvconf paketea kentzeak izen-zerbitzariei buruzko informazio batzuk "
-"eskuragarri ez egotea eragin dezake. Arazo hau konpontzeko, "
-"sistema berrabiaraztea gomendatzen da."
+"eskuragarri ez egotea eragin dezake. Arazo hau konpontzeko, sistema "
+"berrabiaraztea gomendatzen da."
 
 #. Type: boolean
 #. Description
@@ -195,3 +194,37 @@
 "fitxategira gehitu direnean, /etc/resolvconf/resolv.conf.d/tail lotura /dev/"
 "null-erako batez ordeztu beharko zen."
 
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/fi.po'
--- debian/po/fi.po	2012-01-02 07:57:48 +0000
+++ debian/po/fi.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.38\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2008-02-20 00:13+0200\n"
 "Last-Translator: Esko Arajärvi <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
@@ -30,14 +30,14 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Paketti resolvconf sisältää tarvittavat rakenteet selvittäjän "
 "asetustiedoston dynaamiseksi päivittämiseksi. Yksi tarpeellinen osa on "
-"symbolinen linkki nimeltä /etc/resolv.conf tiedostoon /run/resolvconf/"
-"resolv.conf. Jos valitset tämän vaihtoehdon, linkki luodaan. Olemassa oleva "
+"symbolinen linkki nimeltä /etc/resolv.conf tiedostoon /run/resolvconf/resolv."
+"conf. Jos valitset tämän vaihtoehdon, linkki luodaan. Olemassa oleva "
 "tiedosto /etc/resolv.conf talletetaan nimelle /etc/resolvconf/resolv.conf.d/"
 "original ja palautetaan, jos tämä paketti poistetaan."
 
@@ -175,3 +175,38 @@
 "Kun vaaditut �dns-nameservers�-rivit on lisätty tiedostoon /etc/network/"
 "interfaces, Linkki /etc/resolvconf/resolv.conf.d/tail tulisi muuttaa "
 "osoittamaan sijaintiin /dev/null."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2012-01-02 07:57:48 +0000
+++ debian/po/fr.po	2012-05-06 19:31:17 +0000
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.55\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-06-03 08:07+0200\n"
 "Last-Translator: Christian Perrier <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
@@ -37,17 +37,17 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Le paquet resolvconf installe l'infrastructure permettant la mise à jour du "
 "fichier de configuration du résolveur. Une des modifications nécessaires est "
 "la mise en place d'un lien symbolique depuis /etc/resolv.conf vers /run/"
-"resolvconf/resolv.conf. Si vous choisissez cette option, ce lien sera "
-"créé. Le fichier /etc/resolv.conf sera conservé sous le nom de /etc/"
-"resolvconf/resolv.conf.d/original. Si ce paquet est enlevé, le fichier sera "
-"remis dans son état original."
+"resolvconf/resolv.conf. Si vous choisissez cette option, ce lien sera créé. "
+"Le fichier /etc/resolv.conf sera conservé sous le nom de /etc/resolvconf/"
+"resolv.conf.d/original. Si ce paquet est enlevé, le fichier sera remis dans "
+"son état original."
 
 #. Type: boolean
 #. Description
@@ -205,3 +205,38 @@
 "Après avoir modifié /etc/network/interfaces pour ajouter les lignes « dns-"
 "nameservers », vous devriez faire pointer le lien symbolique /etc/resolvconf/"
 "resolv.conf.d/tail vers /dev/null."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/gl.po'
--- debian/po/gl.po	2012-01-02 07:57:48 +0000
+++ debian/po/gl.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.37\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2008-02-11 19:03+0000\n"
 "Last-Translator: Jacobo Tarrio <[e-mail]>\n"
 "Language-Team: Galician <[e-mail]>\n"
@@ -28,9 +28,9 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "O paquete \"resolvconf\" contén a infraestrutura necesaria para actualizar "
 "dinamicamente o ficheiro de configuración do resolvedor. Parte dela é unha "
@@ -173,3 +173,38 @@
 "Despois de engadir as liñas \"dns-nameserver\" necesarias ao ficheiro /etc/"
 "network/interfaces , deberíase substituír a ligazón /etc/resolvconf/resolv."
 "conf.d/tail por unha ligazón a /dev/null."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/it.po'
--- debian/po/it.po	2012-01-02 07:57:48 +0000
+++ debian/po/it.po	2012-05-06 19:31:17 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.57\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-06-28 11:03+0200\n"
 "Last-Translator: Marco Nenciarini <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
@@ -29,17 +29,17 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Il pacchetto resolvconf contiene l'infrastruttura necessaria per aggiornare "
 "dinamicamente il file di configurazione della risoluzione dei nomi. Parte "
 "fondamentale dell'infrastruttura è il collegamento simbolico /etc/resolv."
-"conf verso /run/resolvconf/resolv.conf. Se si accetta verrà creato "
-"questo collegamento; il file /etc/resolv.conf esistente viene preservato "
-"come /etc/resolvconf/resolv.conf.d/original e verrà ripristinato alla "
-"rimozione di questo pacchetto."
+"conf verso /run/resolvconf/resolv.conf. Se si accetta verrà creato questo "
+"collegamento; il file /etc/resolv.conf esistente viene preservato come /etc/"
+"resolvconf/resolv.conf.d/original e verrà ripristinato alla rimozione di "
+"questo pacchetto."
 
 #. Type: boolean
 #. Description
@@ -196,3 +196,38 @@
 "Una volta aggiunte le righe obbligatorie \"dns-nameservers\" a /etc/network/"
 "interfaces, il collegamento /etc/resolvconf/resolv.conf.d/tail deve essere "
 "sostituito con uno verso /dev/null."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2012-01-02 07:57:48 +0000
+++ debian/po/ja.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.41\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2008-08-03 21:04+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
@@ -28,16 +28,16 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "resolvconf パッケージ��リゾル�設定ファイル�動的更新�必���れる仕組�を"
 "�ん����。必���る仕組��一�� /etc/resolv.conf �ら /run/resolvconf/"
-"resolv.conf ��シンボリックリンク��。��オプションを�����リンク"
-"�作��れ��。����る /etc/resolv.conf ファイル� /etc/resolvconf/"
-"resolv.conf.d/original ����存�れ�� (��ファイル��パッケージ�削除�"
-"れる際�元�戻�れ��)。"
+"resolv.conf ��シンボリックリンク��。��オプションを�����リンク�作"
+"��れ��。����る /etc/resolv.conf ファイル� /etc/resolvconf/resolv."
+"conf.d/original ����存�れ�� (��ファイル��パッケージ�削除�れる際"
+"�元�戻�れ��)。"
 
 #. Type: boolean
 #. Description
@@ -171,3 +171,38 @@
 "/etc/network/interfaces �必�� \"dns-nameservers\" 行を加��後�/etc/"
 "resolvconf/resolv.conf.d/tail ��シンボリックリンクを /dev/null ��リンク�"
 "変更�る必���り��。"
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2012-01-02 07:57:48 +0000
+++ debian/po/nl.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.56\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-06-24 14:04+0200\n"
 "Last-Translator: Vincent Zweije <[e-mail]>\n"
 "Language-Team: Dutch <[e-mail]>\n"
@@ -28,16 +28,16 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Het resolvconf-pakket bevat de infrastructuur om automatisch bijwerken van "
 "het resolver-configuratiebestand mogelijk te maken. Een gedeelte van de "
 "noodzakelijke infrastructuur is een symbolische koppeling van /etc/resolv."
-"conf naar /run/resolvconf/resolv.conf. Als u deze optie accepteert zal "
-"deze koppeling gemaakt worden; het bestaande /etc/resolv.conf-bestand zal "
-"worden bewaard als /etc/resolvconf/resolv.conf.d/original en zal worden "
+"conf naar /run/resolvconf/resolv.conf. Als u deze optie accepteert zal deze "
+"koppeling gemaakt worden; het bestaande /etc/resolv.conf-bestand zal worden "
+"bewaard als /etc/resolvconf/resolv.conf.d/original en zal worden "
 "teruggeplaatst als het pakket wordt verwijderd."
 
 #. Type: boolean
@@ -195,3 +195,38 @@
 "Nadat de benodigde \"dns-nameservers\"-regels zijn toegevoegd aan /etc/"
 "network/interfaces, dient de symbolische koppeling /etc/resolvconf/resolv."
 "conf.d/tail te worden vervangen door één die naar /dev/null wijst."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/pt.po'
--- debian/po/pt.po	2012-01-02 07:57:48 +0000
+++ debian/po/pt.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf_1.56\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-06-24 23:33+0000\n"
 "Last-Translator: Pedro Ribeiro <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
@@ -28,9 +28,9 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "O pacote resolvconf contém a infraestrutura requerida para actualizar "
 "dinamicamente o ficheiro de configuração do resolver. Parte da "
@@ -128,8 +128,8 @@
 "recommended that the system be rebooted."
 msgstr ""
 "A remoção do pacote resolvconf pode ter resultado na indisponibilidade de "
-"alguma informação acerca de servidores de nomes. Para corrigir este " 
-"problema é recomendável que o sistema seja reiniciado."
+"alguma informação acerca de servidores de nomes. Para corrigir este problema "
+"é recomendável que o sistema seja reiniciado."
 
 #. Type: boolean
 #. Description
@@ -191,3 +191,38 @@
 "Após as linhas \"dns-nameserver\" necessárias terem sido acrescentadas ao "
 "ficheiro /etc/network/interfaces, a ligação simbólica /etc/resolvconf/resolv."
 "conf.d/tail deve ser substituída por uma para /dev/null."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2012-01-02 07:57:48 +0000
+++ debian/po/ru.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.55\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-06-04 10:55+0400\n"
 "Last-Translator: Yuri Kozlov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: boolean
 #. Description
@@ -31,9 +31,9 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Пакет resolvconf �одержит инфра�труктуру дл� динамиче�кого обновлени� файла "
 "на�тройки определител� имён. Одной из необходимых ча�тей инфра�труктуры "
@@ -130,9 +130,8 @@
 "about name servers becoming unavailable. To correct this problem it is "
 "recommended that the system be rebooted."
 msgstr ""
-"Удаление пакета resolvconf может приве�ти потере информации "
-"о �ерверах имён. Дл� у�транени� проблемы перезагрузите "
-"�и�тему."
+"Удаление пакета resolvconf может приве�ти потере информации о �ерверах имён. "
+"Дл� у�транени� проблемы перезагрузите �и�тему."
 
 #. Type: boolean
 #. Description
@@ -151,8 +150,8 @@
 msgstr ""
 "Е�ли ваш �татиче�кий файл на�тройки определител� имён (/etc/resolv.conf) "
 "�одержит адре�а �ерверов имён, то �ти адре�а должны быть запи�аны в �троках "
-"«dns-nameservers» в файл /etc/network/interfaces. Подробней об �том "
-"напи�ано на �транице руковод�тва resolvconf(8) и в файле README."
+"«dns-nameservers» в файл /etc/network/interfaces. Подробней об �том напи�ано "
+"на �транице руковод�тва resolvconf(8) и в файле README."
 
 #. Type: boolean
 #. Description
@@ -194,3 +193,37 @@
 "nameservers», нужно изменить �имволиче�кую ��ылку /etc/resolvconf/resolv."
 "conf.d/tail, чтобы она указывала на /dev/null."
 
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/sv.po'
--- debian/po/sv.po	2012-01-02 07:57:48 +0000
+++ debian/po/sv.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.55\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2011-06-03 03:44+0100\n"
 "Last-Translator: Martin Bagge / brother <[e-mail]>\n"
 "Language-Team: Swedish <[e-mail]>\n"
@@ -30,17 +30,16 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Detta paket innehåller infrastrukturen som krävs för dynamiska uppdateringar "
 "av filen för uppslagskonfigurationen. En del av den nödvändiga "
 "infrastrukturen är en symbolisk länk från /etc/resolv.conf till /run/"
-"resolvconf/resolv.conf. Om du godkänner kommer denna länk att skapas. "
-"Den existerande filen /etc/resolv.conf kommer att behållas som /etc/"
-"resolvconf/resolv.conf.d/original; den kommer att återställas om detta paket "
-"tas bort."
+"resolvconf/resolv.conf. Om du godkänner kommer denna länk att skapas. Den "
+"existerande filen /etc/resolv.conf kommer att behållas som /etc/resolvconf/"
+"resolv.conf.d/original; den kommer att återställas om detta paket tas bort."
 
 #. Type: boolean
 #. Description
@@ -192,3 +191,38 @@
 "Efter du har modifierat /etc/network/interfaces och lagt till raderna för "
 "\"dns-nameservers\" som krävs bör du peka en symbolisk länk från /etc/"
 "resolvconf/resolv.conf.d/tail till /dev/null."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2012-01-02 07:57:48 +0000
+++ debian/po/templates.pot	2012-05-06 19:31:17 +0000
@@ -1,13 +1,14 @@
-# LANGUAGE translation of resolvconf debconf templates
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the resolvconf package.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: resolvconf VERSION\n"
+"Project-Id-Version: resolvconf\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -29,9 +30,9 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 
 #. Type: boolean
@@ -146,3 +147,38 @@
 "interfaces, the /etc/resolvconf/resolv.conf.d/tail link should be replaced "
 "by one to /dev/null."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/po/vi.po'
--- debian/po/vi.po	2012-01-02 07:57:48 +0000
+++ debian/po/vi.po	2012-05-06 19:31:17 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: resolvconf 1.39\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-05-31 20:26+0200\n"
+"POT-Creation-Date: 2012-05-02 12:49-0700\n"
 "PO-Revision-Date: 2008-02-12 22:24+1030\n"
 "Last-Translator: Clytie Siddall <[e-mail]>\n"
 "Language-Team: Vietnamese <[e-mail]>\n"
@@ -30,16 +30,16 @@
 "The resolvconf package contains the infrastructure required for dynamic "
 "updating of the resolver configuration file. Part of the necessary "
 "infrastructure is a symbolic link from /etc/resolv.conf to /run/resolvconf/"
-"resolv.conf. If you choose this option then this link will be created; "
-"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
-"resolv.conf.d/original, and will be restored if this package is removed."
+"resolv.conf. If you choose this option then this link will be created; the "
+"existing /etc/resolv.conf file will be preserved as /etc/resolvconf/resolv."
+"conf.d/original, and will be restored if this package is removed."
 msgstr ""
 "Gói resolveconf chứa cơ sở hạ tầng cần thiết để cập nhật động tập tin cấu "
 "hình của phần m�m giải quyết. Một phần của cơ sở hạ tầng cần thiết là một "
-"liên kết tượng trưng từ « /etc/resolv.conf » đến « /run/resolvconf/"
-"resolv.conf ». Bật tùy ch�n này thì liên kết này sẽ được tạo; tập tin « /etc/"
-"resolv.conf » đã tồn tại sẽ được bảo tồn dưới dạng « /etc/resolvconf/resolv."
-"conf.d/original » và sẽ cũng được phục hồi nếu gói này bị gỡ b�."
+"liên kết tượng trưng từ « /etc/resolv.conf » đến « /run/resolvconf/resolv."
+"conf ». Bật tùy ch�n này thì liên kết này sẽ được tạo; tập tin « /etc/resolv."
+"conf » đã tồn tại sẽ được bảo tồn dưới dạng « /etc/resolvconf/resolv.conf.d/"
+"original » và sẽ cũng được phục hồi nếu gói này bị gỡ b�."
 
 #. Type: boolean
 #. Description
@@ -175,3 +175,38 @@
 "Sau khi các dòng « dns-nameservers » cần thiết đã được thêm vào tập tin « /"
 "etc/network/interfaces », liên kết « /etc/resolvconf/resolv.conf.d/tail » "
 "nên bị thay thế bằng một liên kết tới « /dev/null »."
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Removing immutable filesystem bit from /etc/resolv.conf"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The file /etc/resolv.conf was marked immutable on the filesystem with the "
+"'chattr' command.  You may have done this to avoid the file being managed by "
+"NetworkManager in the past.  In Ubuntu 12.04 and above, this file is managed "
+"by resolvconf in order to correctly support dynamic sources of DNS "
+"information."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"The immutable flag on /etc/resolv.conf will be removed now, and the current "
+"file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the "
+"original file contained static resolver configuration, it is recommended "
+"that you copy the file to /etc/resolvconf/resolv.conf.d/head."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"After upgrade you may remove the /etc/resolv.conf symlink and restore the "
+"original contents of this file, but this is not recommended."
+msgstr ""
 
=== modified file 'debian/postinst'
--- debian/postinst	2012-02-20 03:54:42 +0000
+++ debian/postinst	2012-05-06 19:31:17 +0000
@@ -15,78 +15,70 @@
 
 OLD_RUN_DIR=/var/run
 
-echo_first_arg() { echo "$1" ; }
 is_immutable_file() {
 	[ "$1" ] || return 2
 	[ -e "$1" ] || return 1
 	[ ! -L "$1" ] || return 1
-	which lsattr >/dev/null 2>&1 || return 2
-	echo_first_arg $(lsattr "$1") | grep -sq i
+	lsattr "$1" | awk '$1 ~ /i/ { exit 0; }; { exit 1; }'
 }
 
-### Symlink ###
 
 case "$1" in
   configure)
 	# Linkify /etc/resolv.conf if appropriate
 	db_get resolvconf/linkify-resolvconf
-	if [ "$RET" = "true" ] || [ -e /var/lib/resolvconf/convert ]; then
-		# Cleanup flag from previous implementation where the symlink
-		# would be created by the upstart job (wasn't working because of / writability)
-		# FIXME: This code and the above || [ -e /var/lib/resolvconf/convert ] can be
-		#        dropped in Ubuntu 12.10.
-		rm -rf /var/lib/resolvconf
-
+	if [ "$RET" = "true" ] ; then
 		if is_immutable_file /etc/resolv.conf ; then
-			report_err "Cannot replace the current /etc/resolv.conf with a symbolic link because it is immutable. To correct this problem, gain root privileges in a terminal and run 'chattr -i /etc/resolv.conf' and then 'dpkg --configure resolvconf'. Aborting."
-			exit 1
-		else
-			if [ -f /etc/resolv.conf ] \
-			   && [ ! -L /etc/resolv.conf ]
-			then
-				# Back up original file
-				if [ ! -e /etc/resolvconf/resolv.conf.d/original ] ; then
-					cp -a /etc/resolv.conf /etc/resolvconf/resolv.conf.d/original
-					db_get resolvconf/link-tail-to-original
-					if [ "$RET" = "true" ]; then
-						ln -s original /etc/resolvconf/resolv.conf.d/tail
-					fi
+			db_input critical resolvconf/fixing-immutable
+			chattr -i /etc/resolv.conf
+		fi
+
+		if [ -f /etc/resolv.conf ] \
+		   && [ ! -L /etc/resolv.conf ]
+		then
+			# Back up original file
+			if [ ! -e /etc/resolvconf/resolv.conf.d/original ] ; then
+				cp -a /etc/resolv.conf /etc/resolvconf/resolv.conf.d/original
+				db_get resolvconf/link-tail-to-original
+				if [ "$RET" = "true" ]; then
+					ln -s original /etc/resolvconf/resolv.conf.d/tail
 				else
-					cp -a /etc/resolv.conf /etc/resolv.conf.dpkg-old
+					: > /etc/resolvconf/resolv.conf.d/tail
 				fi
-
+			else
+				cp -a /etc/resolv.conf /etc/resolv.conf.dpkg-old
+			fi
 				# Even though we create this dir in the preinst,
-				# don't assume that it's still here; a reboot
-				# after unpack may have left us with no upstart
-				# job in place and /run cleaned out.
-				mkdir -p /run/resolvconf/interface
+			# don't assume that it's still here; a reboot
+			# after unpack may have left us with no upstart
+			# job in place and /run cleaned out.
+			mkdir -p /run/resolvconf/interface
 
-				# Before creating the link, make sure that the original file is
-				# at the target of the link.  /sbin/resolvconf will overwrite
-				# this when it does an update, of course.
-				if [ ! -e /run/resolvconf/resolv.conf ] ; then
-					cp -a /etc/resolv.conf /run/resolvconf/resolv.conf
-				fi
-				# Add the original file to the database so that its contents
-				# are included when resolvconf updates.
-				# Yes, this is an ugly workaround for the problem that there
-				# is no way to obtain nameserver information from interface
-				# configurers after they have done their configuration work.
-				cp -a /etc/resolv.conf /run/resolvconf/interface/original.resolvconf
+			# Before creating the link, make sure that the original file is
+			# at the target of the link.  /sbin/resolvconf will overwrite
+			# this when it does an update, of course.
+			if [ ! -e /run/resolvconf/resolv.conf ] ; then
+				cp -a /etc/resolv.conf /run/resolvconf/resolv.conf
 			fi
-			# Create the link and make sure we don't convert it again on upgrade
-			# The link is relative to allow for cp from outside a chroot into a chroot
-			# to work without overwriting the file outside the chroot (or failing)
-			ln -nsf ../run/resolvconf/resolv.conf /etc/resolv.conf
-			db_set resolvconf/linkify-resolvconf false
+			# Add the original file to the database so that its contents
+			# are included when resolvconf updates.
+			# Yes, this is an ugly workaround for the problem that there
+			# is no way to obtain nameserver information from interface
+			# configurers after they have done their configuration work.
+			cp -a /etc/resolv.conf /run/resolvconf/interface/original.resolvconf
 		fi
+
+		# Create the link and make sure we don't convert it again on upgrade
+		# The link is relative to allow for cp from outside a chroot into a chroot
+		# to work without overwriting the file outside the chroot (or failing)
+		ln -nsf ../run/resolvconf/resolv.conf /etc/resolv.conf
+		db_set resolvconf/linkify-resolvconf false
 	fi
 
 	# FHS violation; get rid of it, we use /run directly now.
 	if [ -e /etc/resolvconf/run ]; then
 		rm -rf /etc/resolvconf/run
 	fi
-
 	;;
   # triggered)
 	# Don't do anything here
 
=== modified file 'debian/postrm'
--- debian/postrm	2012-02-02 01:43:09 +0000
+++ debian/postrm	2012-05-06 19:31:17 +0000
@@ -8,6 +8,8 @@
 report() { echo "${MYNAME}: $*" ; }
 report_info() { report "$*" >&2 ; }
 
+OLD_RUN_DIR=/var/run
+
 is_installed() {
 	# Same function in preinst, postinst, postrm
 	[ "$1" ] || return 1
@@ -73,13 +75,19 @@
 	#
 	# Remove all remaining cruft
 	#
+	if [ -L /etc/resolvconf/run ] ; then
+		rm -f /etc/resolvconf/run
+	elif [ -d /etc/resolvconf/run ] ; then
+		rm -rf /etc/resolvconf/run
+	fi
 	rm -f /etc/resolvconf/resolv.conf.d/tail
 	rm -f /etc/resolvconf/resolv.conf.d/original
 	rm -f /etc/resolvconf/update.d/bind  # Old conffile
 	rm -f /etc/default/resolvconf
 	rm -f /etc/dhcp3/dhclient-enter-hooks.d/resolvconf
+	rm -f /etc/init.d/resolvconf.dpkg-old
+	rm -rf "${OLD_RUN_DIR}/resolvconf" || :
 	rm -rf /run/resolvconf || :
-	rm -rf /etc/init.d/resolvconf.dpkg-old
 	;;
   # disappear|upgrade)
 	# Don't do anything on upgrade
 
=== modified file 'debian/preinst'
--- debian/preinst	2012-01-02 07:19:42 +0000
+++ debian/preinst	2012-05-06 19:31:17 +0000
@@ -4,7 +4,7 @@
 
 MYNAME=resolvconf.preinst
 report() { echo "${MYNAME}: $*" ; }
-report_err() { report "Error: $*" >&2 ; }
+report_warn() { report "Warning: $*" >&2 ; }
 report_info() { report "$*" >&2 ; }
 
 is_installed() {
@@ -17,19 +17,18 @@
 ### Create run-time directories ###
 #
 # We create the run-time directories here, in the preinst, so that even if
-# resolvconf is run before the postinst runs then there is nevertheless a
-# place for resolvconf to store data.  (The latter can occur if resolvconf
+# resolvconf is run before the postinst runs there is nevertheless a place
+# for resolvconf to store data.  The latter can occur if resolvconf
 # is installed simultaneously with a caching nameserver package whose
-# postinst runs resolvconf to add its IP address.)
-#
-# The new standard location is /run;
-# the old standard location was /lib/init/rw on Debian, /var/run/ on Ubuntu.
+# postinst runs resolvconf to add its IP address.
 #
 case "$1" in
   install|upgrade)
 	# Ensure that /run/resolvconf/interface exists.
 	mkdir -p /run/resolvconf/interface
 
+	# Ensure that /etc/resolvconf exists.
+	mkdir -p /etc/resolvconf
 	;;
   # abort-upgrade)
 	# Don't do anything because we don't anything in the postrm on upgrade or on failed-upgrade
 
=== modified file 'debian/resolvconf.000resolvconf.if-up'
--- debian/resolvconf.000resolvconf.if-up	2011-11-30 19:05:04 +0000
+++ debian/resolvconf.000resolvconf.if-up	2012-05-06 19:31:17 +0000
@@ -30,5 +30,5 @@
 "
 done
 
-echo -n "$R" | /sbin/resolvconf -a "${IFACE}.${ADDRFAM}"
+echo -n "$R" | /sbin/resolvconf -a "${IFACE}.${ADDRFAM}" || :
 
 
=== modified file 'debian/resolvconf.resolvconf.if-down'
--- debian/resolvconf.resolvconf.if-down	2011-11-30 19:05:04 +0000
+++ debian/resolvconf.resolvconf.if-down	2012-05-06 19:31:17 +0000
@@ -16,9 +16,9 @@
   dhcp)
 	# Delete record left behind by TERMinated udhcpc
 	# This works around bug #605215
-	/sbin/resolvconf -d "${IFACE}.udhcpc"
+	/sbin/resolvconf -d "${IFACE}.udhcpc" || :
 	;;
 esac
 
-/sbin/resolvconf -d "${IFACE}.${ADDRFAM}"
+/sbin/resolvconf -d "${IFACE}.${ADDRFAM}" || :
 
 
=== modified file 'debian/templates'
--- debian/templates	2012-02-20 03:54:42 +0000
+++ debian/templates	2012-05-06 19:31:17 +0000
@@ -82,3 +82,20 @@
  After the required "dns-nameservers" lines have been added to
  /etc/network/interfaces, the /etc/resolvconf/resolv.conf.d/tail link
  should be replaced by one to /dev/null.
+
+Template: resolvconf/fixing-immutable
+Type: error
+_Description: Removing immutable filesystem bit from /etc/resolv.conf
+ The file /etc/resolv.conf was marked immutable on the filesystem with the
+ 'chattr' command.  You may have done this to avoid the file being managed
+ by NetworkManager in the past.  In Ubuntu 12.04 and above, this file is
+ managed by resolvconf in order to correctly support dynamic sources of DNS
+ information.
+ .
+ The immutable flag on /etc/resolv.conf will be removed now, and the current
+ file will be moved to /etc/resolvconf/resolv.conf.d/original.  If the
+ original file contained static resolver configuration, it is recommended
+ that you copy the file to /etc/resolvconf/resolv.conf.d/head.
+ .
+ After upgrade you may remove the /etc/resolv.conf symlink and restore the
+ original contents of this file, but this is not recommended.
 
=== modified file 'man/resolvconf.8'
--- man/resolvconf.8	2012-03-17 19:11:52 +0000
+++ man/resolvconf.8	2012-05-06 19:31:17 +0000
@@ -329,7 +329,7 @@
 Copy of the \fI/etc/resolv.conf\fR file before the resolvconf package was installed.
 This file has no effect on the functioning of resolvconf;
 it is retained so that \fI/etc/resolv.conf\fR can be restored
-to its original state if the resolvconf package if removed.
+to its original state if the resolvconf package is removed.
 
 Note also that a copy of this file is included in the database
 until the first reboot after installation of the resolvconf package;