mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-31 07:19:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1069 from rsampaio/rsampaio-nodev-dev

Browse Source 
Add flag in mount_entry to skip NODEV in case of a persistent dev entry
This commit is contained in:
Serge Hallyn
2016-07-08 10:35:44 -05:00
committed by GitHub
parent c80de904c9 ae7a770e0a
commit c7d5c3e508
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lxc/conf.c
View File

@@ -1634,7 +1634,7 @@ static char *get_field(char *src, int nfields)
static int mount_entry(const char *fsname, const char *target,
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
struct statvfs sb;
@@ -1663,7 +1663,7 @@ static int mount_entry(const char *fsname, const char *target,
unsigned long required_flags = rqd_flags;
if (sb.f_flag & MS_NOSUID)
required_flags |= MS_NOSUID;
if (sb.f_flag & MS_NODEV)
if (sb.f_flag & MS_NODEV && !dev)
required_flags |= MS_NODEV;
if (sb.f_flag & MS_RDONLY)
required_flags |= MS_RDONLY;
@@ -1785,6 +1785,7 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
char *mntdata;
int ret;
bool optional = hasmntopt(mntent, "optional") != NULL;
bool dev = hasmntopt(mntent, "dev") != NULL;
char *rootfs_path = NULL;
if (rootfs && rootfs->path)
@@ -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,
mntdata, optional, rootfs_path);
mntdata, optional, dev, rootfs_path);
free(mntdata);
return ret;