CVS commit: pkgsrc/pkgtools/mksandbox

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct 14 12:50:07 UTC 2016

Modified Files:
        pkgsrc/pkgtools/mksandbox: Makefile
        pkgsrc/pkgtools/mksandbox/files: mksandbox

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/pkgtools/mksandbox/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/pkgtools/mksandbox/files/mksandbox

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/mksandbox/Makefile
diff -u pkgsrc/pkgtools/mksandbox/Makefile:1.11 pkgsrc/pkgtools/mksandbox/Makefile:1.12
--- pkgsrc/pkgtools/mksandbox/Makefile:1.11     Thu Mar  3 04:41:15 2016
+++ pkgsrc/pkgtools/mksandbox/Makefile  Fri Oct 14 12:50:07 2016
@@ -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

Index: pkgsrc/pkgtools/mksandbox/files/mksandbox
diff -u pkgsrc/pkgtools/mksandbox/files/mksandbox:1.9 pkgsrc/pkgtools/mksandbox/files/mksandbox:1.10
--- pkgsrc/pkgtools/mksandbox/files/mksandbox:1.9       Thu Mar  3 04:41:15 2016
+++ pkgsrc/pkgtools/mksandbox/files/mksandbox   Fri Oct 14 12:50:07 2016
@@ -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 @@ Linux)
        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 @@ case $opsys in
 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
        ;;