mount: print error when --disable_clone_newns is used but no --chroot was specified
authorRobert Swiecki <robert@swiecki.net>
Sun, 1 Oct 2017 03:47:10 +0000 (05:47 +0200)
committerRobert Swiecki <robert@swiecki.net>
Sun, 1 Oct 2017 03:47:10 +0000 (05:47 +0200)
mount.c

diff --git a/mount.c b/mount.c
index 7d597c0eed9529e66fb5fe4438300e7de6d9fe89..32e25b59d57b98ac992f990dba83401cc24a131b 100644 (file)
--- a/mount.c
+++ b/mount.c
@@ -291,10 +291,14 @@ static bool mountGetDir(char *dir, const char *name)
 static bool mountInitNsInternal(struct nsjconf_t *nsjconf)
 {
        if (nsjconf->clone_newns == false) {
+               if (nsjconf->chroot == NULL) {
+                       PLOG_E
+                           ("--chroot was not specified, and it's required when not using CLONE_NEWNS");
+                       return false;
+               }
                if (chroot(nsjconf->chroot) == -1) {
-                       PLOG_E("chroot('%s')", nsjconf->chroot) {
-                               return false;
-                       }
+                       PLOG_E("chroot('%s')", nsjconf->chroot);
+                       return false;
                }
                if (chdir("/") == -1) {
                        PLOG_E("chdir('/')");