summaryrefslogtreecommitdiff
path: root/pkgtools/mksandbox
diff options
context:
space:
mode:
Diffstat (limited to 'pkgtools/mksandbox')
-rw-r--r--pkgtools/mksandbox/Makefile4
-rwxr-xr-xpkgtools/mksandbox/files/mksandbox10
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgtools/mksandbox/Makefile b/pkgtools/mksandbox/Makefile
index 868dd165060..de757802e51 100644
--- a/pkgtools/mksandbox/Makefile
+++ b/pkgtools/mksandbox/Makefile
@@ -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
diff --git a/pkgtools/mksandbox/files/mksandbox b/pkgtools/mksandbox/files/mksandbox
index 0369a7283b2..7e439caa03e 100755
--- a/pkgtools/mksandbox/files/mksandbox
+++ b/pkgtools/mksandbox/files/mksandbox
@@ -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>
# 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
;;