shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

Merge pull request #429 from richardmaw-codethink/nspawn-userns-uid-shift-autodetection-fix

Browse Source 
nspawn: determine_uid_shift before forking
This commit is contained in:
Tom Gundersen 2015-06-30 18:24:14 +02:00
commit b7a049dba5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nspawn/nspawn.c
View File

@ -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;