Skip to content

L
lxc
Commit 4f1d50d1 by Serge Hallyn
Options

cache whether 'optional' was in mntopts

after commit 4e4ca161 we are checking for optional in mntopts after we forcibly remove it. Cache whether we had it before removing it. Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent 60838413
Showing with 6 additions and 3 deletions
src/lxc/conf.c
...@@ -1913,6 +1913,7 @@ static inline int mount_entry_on_systemfs(struct mntent *mntent) ...@@ -1913,6 +1913,7 @@ static inline int mount_entry_on_systemfs(struct mntent *mntent)
int ret; int ret;
FILE *pathfile = NULL; FILE *pathfile = NULL;
char* pathdirname = NULL; char* pathdirname = NULL;
bool optional = hasmntopt(mntent, "optional") != NULL;
if (hasmntopt(mntent, "create=dir")) { if (hasmntopt(mntent, "create=dir")) {
if (mkdir_p(mntent->mnt_dir, 0755) < 0) { if (mkdir_p(mntent->mnt_dir, 0755) < 0) {
...@@ -1946,7 +1947,7 @@ static inline int mount_entry_on_systemfs(struct mntent *mntent) ...@@ -1946,7 +1947,7 @@ static inline int mount_entry_on_systemfs(struct mntent *mntent)
ret = mount_entry(mntent->mnt_fsname, mntent->mnt_dir, ret = mount_entry(mntent->mnt_fsname, mntent->mnt_dir,
mntent->mnt_type, mntflags, mntdata); mntent->mnt_type, mntflags, mntdata);
if (hasmntopt(mntent, "optional") != NULL) if (optional)
ret = 0; ret = 0;
free(pathdirname); free(pathdirname);
...@@ -1967,6 +1968,7 @@ static int mount_entry_on_absolute_rootfs(struct mntent *mntent, ...@@ -1967,6 +1968,7 @@ static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
const char *lxcpath; const char *lxcpath;
FILE *pathfile = NULL; FILE *pathfile = NULL;
char *pathdirname = NULL; char *pathdirname = NULL;
bool optional = hasmntopt(mntent, "optional") != NULL;
lxcpath = lxc_global_config_value("lxc.lxcpath"); lxcpath = lxc_global_config_value("lxc.lxcpath");
if (!lxcpath) { if (!lxcpath) {
...@@ -2037,7 +2039,7 @@ skipabs: ...@@ -2037,7 +2039,7 @@ skipabs:
free(mntdata); free(mntdata);
if (hasmntopt(mntent, "optional") != NULL) if (optional)
ret = 0; ret = 0;
out: out:
...@@ -2054,6 +2056,7 @@ static int mount_entry_on_relative_rootfs(struct mntent *mntent, ...@@ -2054,6 +2056,7 @@ static int mount_entry_on_relative_rootfs(struct mntent *mntent,
int ret; int ret;
FILE *pathfile = NULL; FILE *pathfile = NULL;
char *pathdirname = NULL; char *pathdirname = NULL;
bool optional = hasmntopt(mntent, "optional") != NULL;
/* relative to root mount point */ /* relative to root mount point */
ret = snprintf(path, sizeof(path), "%s/%s", rootfs, mntent->mnt_dir); ret = snprintf(path, sizeof(path), "%s/%s", rootfs, mntent->mnt_dir);
...@@ -2093,7 +2096,7 @@ static int mount_entry_on_relative_rootfs(struct mntent *mntent, ...@@ -2093,7 +2096,7 @@ static int mount_entry_on_relative_rootfs(struct mntent *mntent,
ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type, ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type,
mntflags, mntdata); mntflags, mntdata);
if (hasmntopt(mntent, "optional") != NULL) if (optional)
ret = 0; ret = 0;
free(pathdirname); free(pathdirname);
......
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