summaryrefslogtreecommitdiff
path: root/src/nspawn/nspawn.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-12-17 21:51:45 +0100
committerLennart Poettering <lennart@poettering.net>2014-12-18 01:36:28 +0100
commit785890acf6d629ff881a1f065f431df1b7fc8c7a (patch)
tree35765d2f93219191be62d337ad60a706b4197867 /src/nspawn/nspawn.c
parent60e1651a31c9c0ed1caef1a63f5e3a87156b0b1e (diff)
machinectl: implement "bind" command to create additional bind mounts from host to container during runtime
Diffstat (limited to 'src/nspawn/nspawn.c')
-rw-r--r--src/nspawn/nspawn.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index a13c1fcd24..72f7d66782 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2082,6 +2082,27 @@ finish:
}
+static int setup_propagate(const char *root) {
+ const char *p, *q;
+
+ (void) mkdir_p("/run/systemd/nspawn/", 0755);
+ (void) mkdir_p("/run/systemd/nspawn/propagate", 0600);
+ p = strappenda("/run/systemd/nspawn/propagate/", arg_machine);
+ (void) mkdir_p(p, 0600);
+
+ q = strappenda(root, "/run/systemd/nspawn/incoming");
+ mkdir_parents(q, 0755);
+ mkdir_p(q, 0600);
+
+ if (mount(p, q, NULL, MS_BIND, NULL) < 0)
+ return log_error_errno(errno, "Failed to install propagation bind mount.");
+
+ if (mount(NULL, q, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0)
+ return log_error_errno(errno, "Failed to make propagation mount read-only");
+
+ return 0;
+}
+
static int setup_image(char **device_path, int *loop_nr) {
struct loop_info64 info = {
.lo_flags = LO_FLAGS_AUTOCLEAR|LO_FLAGS_PARTSCAN
@@ -3260,6 +3281,9 @@ int main(int argc, char *argv[]) {
dev_setup(arg_directory);
+ if (setup_propagate(arg_directory) < 0)
+ _exit(EXIT_FAILURE);
+
if (setup_seccomp() < 0)
_exit(EXIT_FAILURE);
@@ -3571,6 +3595,13 @@ finish:
log_warning_errno(k, "Cannot remove subvolume '%s', ignoring: %m", arg_directory);
}
+ if (arg_machine) {
+ const char *p;
+
+ p = strappenda("/run/systemd/nspawn/propagate", arg_machine);
+ (void) rm_rf(p, false, true, false);
+ }
+
free(arg_directory);
free(arg_template);
free(arg_image);