From: Daniel Hokka Zakrisson Date: Tue, 8 Mar 2011 19:04:29 +0000 (+0100) Subject: Add nomtab option. X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34ab12c667eb08336e8e9b0f414ba26d3ad19a08;hp=81a862d77c28b20efb24aaa52ccda2cf47f2d4eb;p=util-vserver.git Add nomtab option. --- diff --git a/src/secure-mount.c b/src/secure-mount.c index ae0650f..53863e3 100644 --- a/src/secure-mount.c +++ b/src/secure-mount.c @@ -98,6 +98,7 @@ struct Options { #define XFLAG_NOAUTO 0x01 #define XFLAG_FILE 0x02 +#define XFLAG_NOMTAB 0x04 static struct option const CMDLINE_OPTIONS[] = { @@ -173,6 +174,7 @@ static struct FstabOption { { "private", MS_PRIVATE, MS_PRIVATE, 0, false }, { "slave", MS_SLAVE, MS_SLAVE, 0, false }, { "shared", MS_SHARED, MS_SHARED, 0, false }, + { "nomtab", 0, 0, XFLAG_NOMTAB, false }, }; int wrapper_exit_code = 1; @@ -488,7 +490,7 @@ mountSingle(struct MountInfo const *mnt, struct Options *opt) else if (!callExternalMount(mnt)) return false; - if (!opt->ignore_mtab && + if (!opt->ignore_mtab && (mnt->xflag & XFLAG_NOMTAB)==0 && updateMtab(mnt, opt)==-1) { WRITE_MSG(2, "Failed to update mtab-file\n"); // no error