From 12b0a4cfbc4834f585a4b71aad2cf03c7de7f94e Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Thu, 21 Sep 2006 19:43:32 +0000 Subject: [PATCH] Make nodev the default, but don't enforce it for all mounts. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2326 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- src/secure-mount.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/secure-mount.c b/src/secure-mount.c index 46ed09f..b56ff4f 100644 --- a/src/secure-mount.c +++ b/src/secure-mount.c @@ -428,12 +428,9 @@ mountSingle(struct MountInfo const *mnt, struct Options const *opt) return false; if (canHandleInternal(mnt)) { - unsigned long flag = mnt->flag; - if (!(flag & MS_NODEV)) flag |= MS_NODEV; - if (mount(mnt->src, ".", mnt->type ? mnt->type : "", - flag, mnt->data)==-1) { + mnt->flag, mnt->data)==-1) { perror("secure-mount: mount()"); return false; } @@ -648,7 +645,7 @@ int main(int argc, char *argv[]) .src = 0, .dst = 0, .type = 0, - .flag = 0, + .flag = MS_NODEV, .xflag = 0, .data = 0, }; -- 1.8.1.5