Revert "nspawn: determine_uid_shift before forking"

2015-07-03 12:30:53 +02:00
parent 200edc2bcf
commit 391567f479
1 changed files with 4 additions and 4 deletions
@@ -4313,6 +4313,10 @@ static int outer_child(
        if (r < 0)
                return r;

+        r = determine_uid_shift(directory);
+        if (r < 0)
+                return r;
+
        /* Turn directory into bind mount */
        if (mount(directory, directory, NULL, MS_BIND|MS_REC, NULL) < 0)
                return log_error_errno(errno, "Failed to make bind mount: %m");
@@ -4491,10 +4495,6 @@ int main(int argc, char *argv[]) {
        if (r < 0)
                goto finish;

-        r = determine_uid_shift(arg_directory);
-        if (r < 0)
-                return r;
-
        if (geteuid() != 0) {
                log_error("Need to be root.");
                r = -EPERM;