[Piuparts-commits] [piuparts] 01/04: Revert "Revert "p: ensure /etc/mtab exists in the chroot""

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit bbc7acf4148b287738cb6a366df01abcb257eb83
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Oct 6 16:43:08 2015 +0200

    Revert "Revert "p: ensure /etc/mtab exists in the chroot""
    
    This reverts commit dbaafeb7614bb40e420fcee82a2b10622519301b.
---
 debian/changelog | 6 +++++-
 piuparts.py      | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fa45935..af72bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 piuparts (0.67) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * Add wheezy-pu to the suites being tested. (Closes: #800094)
 
+  [ Andreas Beckmann ]
+  * piuparts.py:
+    - Ensure /etc/mtab exists in the chroot.
+
  -- Holger Levsen <holger at debian.org>  Wed, 26 Aug 2015 01:00:23 +0200
 
 piuparts (0.66) unstable; urgency=medium
@@ -14,7 +19,6 @@ piuparts (0.65) unstable; urgency=medium
 
   [ Andreas Beckmann ]
   * piuparts.py:
-    - Ensure /etc/mtab exists in the chroot.
     - Create sources.list entries for --testdebs-repo with '[ trusted=yes ]'
       to avoid needing --do-not-verify-signatures which would act globally.
     - Add --fake-essential-packages option to include packages in the base
diff --git a/piuparts.py b/piuparts.py
index 3c82407..b0491cc 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1532,6 +1532,9 @@ class Chroot:
     def mount_proc(self):
         """Mount /proc inside chroot."""
         self.run(["mount", "-t", "proc", "proc", "/proc"])
+        etcmtab = self.relative("etc/mtab")
+        if not os.path.lexists(etcmtab):
+            os.symlink("../proc/mounts", etcmtab)
         self.mkdir_p("dev/pts")
         self.run(["mount", "-t", "devpts", "devpts", "/dev/pts"])
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git