Bug#775076: unblock (pre-approval or jessie-p-u): autopkgtest (was "Fixing autopkgtest RC bug #775076 via t-p-u")

[Niels Thykier]

Control: tags -1 confirmed moreinfo

On 2015-01-14 16:57, Antonio Terceiro wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org at packages.debian.org
> Usertags: unblock jessie-pu
> 
> Opening a bug report since that's way more likely to be handled in this
> way.
> 

Hi,

Thanks for opening this as a bug.

> On Sun, Jan 11, 2015 at 02:00:45PM +0100, Martin Pitt wrote:
>> Hello release team,
>>
>> Christian Kastner discovered that when using vmdebootstrap with
>> autopkgtest's "VM setup" script it erroneously enables dpkg's
>> "force-unsafe-io" option on the host instead of the guest. This can
>> lead to potential system damage and thus should qualify as RC:
>>
>>   https://bugs.debian.org/775076
>>
>> This is fixed in version 3.9.3 in unstable now, including a postinst
>> cleanup for cleaning up an erroneously created
>> /etc/dpkg/dpkg.cfg.d/autopkgtest on the host.
>>

Ugh, that is indeed very bad.  Please upload the fix for that to tpu at
your earliest convenience.  For reference, I have attached (what I
believe was) the proposed debdiff to this bug (as it makes it easier for
us to keep track of what was approved).

>> [...]
>> autopkgtest is mostly a Debian/Ubuntu developer, QA, and continuous
>> integration tool, so honestly the testing version isn't that
>> interesting any more. So if you prefer, I'd be perfectly okay (and
>> in fact happier) with getting 3.9.3 into testing instead; it has a lot
>> of new features, but also a lot of bug fixes:
>>[...]
>>
>> Thank you and have a nice Sunday!
>>
>> Martin
>>
>> [...]

I must admit that I am tempted to let autopkgtest consider it given the
circumstances and the nature/purpose of the package.  However, please do
not wait with the tpu upload for such a decision.  We are bit overbooked
right now and it will not be my first priority.

Thanks,
~Niels


-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 9040131..7961f2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+autopkgtest (3.6.1) UNRELEASED; urgency=medium
+
+  [ Christian Kastner ]
+  * adt-setup-vm: Modify guest's dpkg config for enabling force-unsafe-io, not
+    host's, when a root directory is specified as argument. (Closes: #775076)
+  * Clean up /etc/dpkg/dpkg.cfg.d/autopkgtest on upgrades if its contents are
+    just "force-unsafe-io", indicating that this file was generated by the
+    above bug.
+
+  [ Martin Pitt ]
+  * adt-setup-vm: Check guest's /etc/network/interfaces for existing eth0
+    instead of host's, when specifying a directory argument. (Spotted as a
+    side issue in #775076)
+
+ -- Martin Pitt <mpitt at debian.org>  Sun, 11 Jan 2015 13:32:13 +0200
+
 autopkgtest (3.6) unstable; urgency=medium
 
   [ Antonio Terceiro ]
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..ec51743
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "3.6.1"; then
+    # If this file exists and its only content is "force-unsafe-io", then it was
+    # generated by #775076 and must be removed.
+    if [ -e /etc/dpkg/dpkg.cfg.d/autopkgtest ]; then
+            if [ "`cat /etc/dpkg/dpkg.cfg.d/autopkgtest`" = "force-unsafe-io" ]; then
+                    echo "Cleaning up erroneous /etc/dpkg/dpkg.cfg.d/autopkgtest..."
+                    rm -f /etc/dpkg/dpkg.cfg.d/autopkgtest
+            fi
+    fi
+fi
+
+#DEBHELPER#
diff --git a/tools/adt-setup-vm b/tools/adt-setup-vm
index 5c25781..4d01e54 100755
--- a/tools/adt-setup-vm
+++ b/tools/adt-setup-vm
@@ -68,13 +68,13 @@ EOF
 fi
 
 # set up networking
-if ! grep -qr eth0 /etc/network/interfaces /etc/network/interfaces.d/; then
+if ! grep -qr eth0 "$root/etc/network/interfaces" "$root/etc/network/interfaces.d/"; then
     /bin/echo -e '\nauto eth0\niface eth0 inet dhcp' >> "$root"/etc/network/interfaces
 fi
 
 # go-faster apt/dpkg
 echo "Acquire::Languages \"none\";" > "$root"/etc/apt/apt.conf.d/90nolanguages
-echo 'force-unsafe-io' > /etc/dpkg/dpkg.cfg.d/autopkgtest
+echo 'force-unsafe-io' > "$root"/etc/dpkg/dpkg.cfg.d/autopkgtest
 
 # auto-detect apt-cacher-ng
 if [ -z "${ADT_APT_PROXY:-}" ]; then