mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-23 17:34:00 +03:00
Merge pull request #429 from richardmaw-codethink/nspawn-userns-uid-shift-autodetection-fix
nspawn: determine_uid_shift before forking
This commit is contained in:
commit
b7a049dba5
@ -4313,10 +4313,6 @@ 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");
|
||||
@ -4495,6 +4491,10 @@ 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;
|
||||
|
Loading…
Reference in New Issue
Block a user