summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorminskim <minskim>2006-09-26 20:56:28 +0000
committerminskim <minskim>2006-09-26 20:56:28 +0000
commit67517e91d97c1d1be5f57496ba6eabaec66cc203 (patch)
tree5f15eb841450c714d4c55d063b3eae9bbb4409c9 /mk
parentaafc5916cbbceefcbd1290d21e07fb1732876a5a (diff)
downloadpkgsrc-67517e91d97c1d1be5f57496ba6eabaec66cc203.tar.gz
Use /bin/mount if it exists on Linux, because some distros (e.g. Ubuntu
Linux) do not have /sbin/mount.
Diffstat (limited to 'mk')
-rwxr-xr-xmk/bulk/mksandbox8
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index 58bf967951a..094807b84fe 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: mksandbox,v 1.42 2006/06/08 01:11:43 minskim Exp $
+# $NetBSD: mksandbox,v 1.43 2006/09/26 20:56:28 minskim Exp $
#
#
# Copyright (c) 2002 Alistair G. Crooks. All rights reserved.
@@ -93,7 +93,11 @@ Linux)
idprog=/usr/bin/id
mkdirprog="/bin/mkdir -p"
mountflags="--bind"
- mountprog=/sbin/mount
+ if [ -f /bin/mount ]; then
+ mountprog=/bin/mount
+ else
+ mountprog=/sbin/mount
+ fi
paxprog=""
sedprog=/bin/sed
sandboxMountDirs="$sandboxMountDirs /proc"