Bug#814854: hurd: some fixes

[Samuel Thibault]

Package: pbuilder
Version: 0.223
Severity: important
Tags: patch
User: debian-hurd at lists.debian.org
Usertags: hurd

Hello,

I have attached a few more fixes for the hurd case: we should just drop
all translator entries from /dev and /servers/socket, just to be on the
safe side.

Also, mounting /proc does work, there is no need to ignore errors here.

Thanks,
Samuel

-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages pbuilder depends on:
ii  debconf [debconf-2.0]  1.5.58
ii  debootstrap            1.0.78
ii  dpkg-dev               1.18.4
ii  wget                   1.17.1-1+b1

Versions of packages pbuilder recommends:
ii  devscripts  2.15.10
ii  fakeroot    1.20.2-1
ii  iproute2    4.3.0-1
ii  net-tools   1.60+git20150829.73cef8a-2
ii  sudo        1.8.15-1.1

Versions of packages pbuilder suggests:
pn  cowdancer   <none>
ii  gdebi-core  0.9.5.7

-- debconf information excluded
-------------- next part --------------
diff --git a/pbuilder-modules b/pbuilder-modules
index 77a8b32..1ccb5ab 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -255,7 +255,7 @@ function umountproc () {
         # Workaround to remove chroot on Hurd: once /dev firmlink is
         # removed, chroot removal either gets stuck or fails by removing
         # some devices.
-        for dev in "$BUILDPLACE"/dev/{netdde,tty*,pty*,fd,vcs}; do
+        for dev in "$BUILDPLACE"/dev/* "$BUILDPLACE"/servers/socket/*; do
             settrans -fg "$dev"
         done
     fi
@@ -282,7 +282,7 @@ function mountproc () {
                 PROCFS="proc"
                 ;;
         esac
-        mount -t "$PROCFS" /proc "$BUILDPLACE/proc" || [ "$DEB_BUILD_ARCH_OS" = hurd ]
+        mount -t "$PROCFS" /proc "$BUILDPLACE/proc"
         ln -s ../proc/mounts "$BUILDPLACE/etc/mtab" 2> /dev/null || true
         mounted[${#mounted[@]}]="$BUILDPLACE/proc"
     fi