diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-07-18 16:07:22 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-07-18 16:07:22 +0000 |
| commit | 08d3aac72dcfcc8763b11e8340f42bb000c70035 (patch) | |
| tree | 73bb3c5bffadb02ac33f1f144d09d47081af25c2 /pkgtools/mksandbox | |
| parent | 41b6110d10fb4fb3e6adae4a96c71739898b8366 (diff) | |
| download | pkgsrc-08d3aac72dcfcc8763b11e8340f42bb000c70035.tar.gz | |
mksandbox-1.1:
* Add /lib64 and /usr/lib64 on Linux.
* Ensure that read-only --bind mounts on Linux are actually read-only.
Diffstat (limited to 'pkgtools/mksandbox')
| -rw-r--r-- | pkgtools/mksandbox/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/mksandbox/files/mksandbox | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgtools/mksandbox/Makefile b/pkgtools/mksandbox/Makefile index 433ae87bcc0..4d76adad4d2 100644 --- a/pkgtools/mksandbox/Makefile +++ b/pkgtools/mksandbox/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2013/05/29 15:57:09 agc Exp $ +# $NetBSD: Makefile,v 1.5 2013/07/18 16:07:22 jperkin Exp $ -DISTNAME= mksandbox-1.0 +DISTNAME= mksandbox-1.1 CATEGORIES= pkgtools MASTER_SITES= # none DISTFILES= # none diff --git a/pkgtools/mksandbox/files/mksandbox b/pkgtools/mksandbox/files/mksandbox index a4ebda6ca9c..8c3eeaf6e4a 100755 --- a/pkgtools/mksandbox/files/mksandbox +++ b/pkgtools/mksandbox/files/mksandbox @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: mksandbox,v 1.3 2013/05/29 15:09:49 wiz Exp $ +# $NetBSD: mksandbox,v 1.4 2013/07/18 16:07:22 jperkin Exp $ # Copyright (c) 2002,2012 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -112,7 +112,7 @@ Linux) fi paxprog="" sedprog=/bin/sed - sandboxMountDirs="$sandboxMountDirs /proc /usr/kerberos" + sandboxMountDirs="$sandboxMountDirs /proc /lib64 /usr/lib64 /usr/kerberos" ;; NetBSD) bmakeprog=make @@ -288,6 +288,9 @@ for d in $sandboxMountDirs; do esac $mkdirprog $sandbox$d; $mountprog $mountflags -r $mounthost$d $sandbox$d; + case "$opsys" in + Linux) $mountprog $mountflags -o remount,bind,ro $mounthost$d $sandbox$d ;; + esac echo "$mounthost$d $d ro \\" >> $sandbox_script done for d in $sandboxWriteDirs; do |