[pkgsrc/trunk]: pkgsrc/pkgtools/mksandbox Update to mksandbox-1.7. Changes:

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9c1968e1e364
branches:  trunk
changeset: 353810:9c1968e1e364
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Oct 14 12:50:07 2016 +0000

description:
Update to mksandbox-1.7.  Changes:

 - Handle /run/resolvconf/resolv.conf explicitly rather than mounting all of
   /run.  If /run exists then systemd will dynamically create /run/user/uid
   tmpfs mounts inside the chroot which mksandbox is unable to unmount.

diffstat:

 pkgtools/mksandbox/Makefile        |   4 ++--
 pkgtools/mksandbox/files/mksandbox |  10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r de3ebe58a095 -r 9c1968e1e364 pkgtools/mksandbox/Makefile
--- a/pkgtools/mksandbox/Makefile       Fri Oct 14 10:32:33 2016 +0000
+++ b/pkgtools/mksandbox/Makefile       Fri Oct 14 12:50:07 2016 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2016/03/03 04:41:15 agc Exp $
+# $NetBSD: Makefile,v 1.12 2016/10/14 12:50:07 jperkin Exp $
 
-PKGNAME=       mksandbox-1.6
+PKGNAME=       mksandbox-1.7
 CATEGORIES=    pkgtools
 
 MAINTAINER=    agc%NetBSD.org@localhost
diff -r de3ebe58a095 -r 9c1968e1e364 pkgtools/mksandbox/files/mksandbox
--- a/pkgtools/mksandbox/files/mksandbox        Fri Oct 14 10:32:33 2016 +0000
+++ b/pkgtools/mksandbox/files/mksandbox        Fri Oct 14 12:50:07 2016 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.9 2016/03/03 04:41:15 agc Exp $
+# $NetBSD: mksandbox,v 1.10 2016/10/14 12:50:07 jperkin Exp $
 
 # Copyright (c) 2002,2012 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -121,7 +121,7 @@
        fi
        paxprog=""
        sedprog=/bin/sed
-       sandboxMountDirs="$sandboxMountDirs /lib64 /usr/lib64 /usr/kerberos /run"
+       sandboxMountDirs="$sandboxMountDirs /lib64 /usr/lib64 /usr/kerberos"
        sandboxWriteDirs="$sandboxWriteDirs /proc"
        ;;
 NetBSD)
@@ -472,6 +472,12 @@
 Darwin)
        $cpprog /var/run/resolv.conf $sandbox/var/run/resolv.conf
        ;;
+Linux)
+       if [ -f /run/resolvconf/resolv.conf ]; then
+               $mkdirprog $sandbox/run/resolvconf
+               $cpprog /run/resolvconf/resolv.conf $sandbox/run/resolvconf/resolv.conf
+       fi
+       ;;
 SunOS)
        $cpprog /etc/mnttab $sandbox/etc/mnttab
        ;;