From: Alan Jenkins <alan.christopher.jenkins@gmail.com>
Date: Wed, 29 Aug 2018 22:38:40 +0000 (+0100)
Subject: namespace: we always use a root_directory now
X-Git-Tag: v240~778^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a756839e6598164fb5a74e631261b1d0589fa11;p=thirdparty%2Fsystemd.git

namespace: we always use a root_directory now

We changed to always setup the new namespace in a separate directory
(commit 0722b35)
---

diff --git a/src/core/namespace.c b/src/core/namespace.c
index c7ccaa51929..0cfe3eb114b 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -419,11 +419,7 @@ static int mount_path_compare(const void *a, const void *b) {
 static int prefix_where_needed(MountEntry *m, size_t n, const char *root_directory) {
         size_t i;
 
-        /* Prefixes all paths in the bind mount table with the root directory if it is specified and the entry needs
-         * that. */
-
-        if (!root_directory)
-                return 0;
+        /* Prefixes all paths in the bind mount table with the root directory if the entry needs that. */
 
         for (i = 0; i < n; i++) {
                 char *s;