From: Felix Abecassis <fabecassis@nvidia.com>
Date: Tue, 16 Apr 2019 21:40:03 +0000 (-0700)
Subject: conf: do lxc.mount.entry mounts right after lxc.mount.fstab
X-Git-Tag: lxc-3.0.4~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6203554bdc8f2b9f8d1a027b4ffb73cb21eb1aa4;p=thirdparty%2Flxc.git

conf: do lxc.mount.entry mounts right after lxc.mount.fstab

These configuration options use the same syntax and therefore it seems
more intuitive to have the same behavior for both of them, which is
not the case today since mount hooks and autodev mounts are called
between the two.

See: https://github.com/lxc/lxc/issues/2932

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index aaf601e07..c4d6dd433 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3493,6 +3493,15 @@ int lxc_setup(struct lxc_handler *handler)
 		return -1;
 	}
 
+	if (!lxc_list_empty(&lxc_conf->mount_list)) {
+		ret = setup_mount_entries(lxc_conf, &lxc_conf->rootfs,
+					  &lxc_conf->mount_list, name, lxcpath);
+		if (ret < 0) {
+			ERROR("Failed to setup mount entries");
+			return -1;
+		}
+	}
+
 	if (lxc_conf->is_execute) {
 		if (execveat_supported()) {
 			int fd;
@@ -3551,15 +3560,6 @@ int lxc_setup(struct lxc_handler *handler)
 		}
 	}
 
-	if (!lxc_list_empty(&lxc_conf->mount_list)) {
-		ret = setup_mount_entries(lxc_conf, &lxc_conf->rootfs,
-					  &lxc_conf->mount_list, name, lxcpath);
-		if (ret < 0) {
-			ERROR("Failed to setup mount entries");
-			return -1;
-		}
-	}
-
 	/* Make sure any start hooks are in the container */
 	if (!verify_start_hooks(lxc_conf)) {
 		ERROR("Failed to verify start hooks");