[cowdancer] 09/11: qemubuilder.c: Avoid first-stage warnings

[James Clarke]

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

jrtc27-guest pushed a commit to branch master
in repository cowdancer.

commit 79f946db6f7fabbd8acd45fe4470199a66629453
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Mon May 2 00:54:21 2016 +0100

    qemubuilder.c: Avoid first-stage warnings
---
 qemubuilder.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemubuilder.c b/qemubuilder.c
index 0243412..63c91d2 100755
--- a/qemubuilder.c
+++ b/qemubuilder.c
@@ -674,7 +674,7 @@ static void write_first_stage(FILE *f, const struct pbuilderconfig* pc)
 	  "echo ' -> qemu-pbuilder first-stage' \n"
 	  "export PBUILDER_INIT_VERSION="XSTR(PBUILDER_INIT_VERSION)"\n"
 	  "export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'\n"
-	  "mount -n /proc /proc -t proc\n"
+	  "[ -d /proc/1 ] || mount -n /proc /proc -t proc\n"
 	  "ln -s /dev/shm /run/shm\n"
 	  "mkdir /run/lock\n"
 	  "chmod 01777 /run/lock\n"
@@ -683,7 +683,7 @@ static void write_first_stage(FILE *f, const struct pbuilderconfig* pc)
 	  "mkdir /dev/shm\n"
 	  "chmod 01777 /dev/shm\n"
 	  "mount -t tmpfs tmpfs /dev/shm\n"
-	  "ln -s /proc/mounts /etc/mtab\n"
+	  "ln -fs /proc/mounts /etc/mtab\n"
 	  "export BUILDDIR="BUILDDIR"\n"
 	  "mkdir -p $BUILDDIR\n"
 	  "ln -s $BUILDDIR /tmp/buildd\n"

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