Skip to content

L
lxc
Commit ea986a87 by Rodrigo Vaz Committed by Stéphane Graber
Options

Add flag in mount_entry to skip NODEV in case of a persistent dev entry

Signed-off-by: 's avatarRodrigo Vaz <rodrigo@heroku.com>
parent 659ce93a
Showing with 4 additions and 3 deletions
src/lxc/conf.c
...@@ -1634,7 +1634,7 @@ static char *get_field(char *src, int nfields) ...@@ -1634,7 +1634,7 @@ static char *get_field(char *src, int nfields)
static int mount_entry(const char *fsname, const char *target, static int mount_entry(const char *fsname, const char *target,
const char *fstype, unsigned long mountflags, const char *fstype, unsigned long mountflags,
const char *data, int optional, const char *rootfs) const char *data, int optional, int dev, const char *rootfs)
{ {
#ifdef HAVE_STATVFS #ifdef HAVE_STATVFS
struct statvfs sb; struct statvfs sb;
...@@ -1663,7 +1663,7 @@ static int mount_entry(const char *fsname, const char *target, ...@@ -1663,7 +1663,7 @@ static int mount_entry(const char *fsname, const char *target,
unsigned long required_flags = rqd_flags; unsigned long required_flags = rqd_flags;
if (sb.f_flag & MS_NOSUID) if (sb.f_flag & MS_NOSUID)
required_flags |= MS_NOSUID; required_flags |= MS_NOSUID;
if (sb.f_flag & MS_NODEV) if (sb.f_flag & MS_NODEV && !dev)
required_flags |= MS_NODEV; required_flags |= MS_NODEV;
if (sb.f_flag & MS_RDONLY) if (sb.f_flag & MS_RDONLY)
required_flags |= MS_RDONLY; required_flags |= MS_RDONLY;
...@@ -1785,6 +1785,7 @@ static inline int mount_entry_on_generic(struct mntent *mntent, ...@@ -1785,6 +1785,7 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
char *mntdata; char *mntdata;
int ret; int ret;
bool optional = hasmntopt(mntent, "optional") != NULL; bool optional = hasmntopt(mntent, "optional") != NULL;
bool dev = hasmntopt(mntent, "dev") != NULL;
char *rootfs_path = NULL; char *rootfs_path = NULL;
if (rootfs && rootfs->path) if (rootfs && rootfs->path)
...@@ -1803,7 +1804,7 @@ static inline int mount_entry_on_generic(struct mntent *mntent, ...@@ -1803,7 +1804,7 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
} }
ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type, mntflags, ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type, mntflags,
mntdata, optional, rootfs_path); mntdata, optional, dev, rootfs_path);
free(mntdata); free(mntdata);
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment