emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bin/xbps-uunshare: allow relative chroot directory

Browse Source
This commit is contained in:
Duncaen 2016-09-25 22:22:44 +02:00
parent c5784e9cc3
commit 2a6e805bb4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/xbps-uunshare/main.c
View File

@ -157,7 +157,7 @@ main(int argc, char **argv)
if (argc < 2) if (argc < 2)
usage(argv0); usage(argv0);
chrootdir = argv[0]; chrootdir = argv[-1];
cmd = argv[1]; cmd = argv[1];
cmdargs = argv + 1; cmdargs = argv + 1;
@ -165,6 +165,14 @@ main(int argc, char **argv)
if (strcmp(chrootdir, "/") == 0) if (strcmp(chrootdir, "/") == 0)
die("/ is not allowed to be used as chrootdir"); die("/ is not allowed to be used as chrootdir");
/* Make chrootdir absolute */
if (chrootdir[0] != '/') {
char cwd[PATH_MAX-1];
if (getcwd(cwd, sizeof(cwd)) == NULL)
die("getcwd");
chrootdir = xbps_xasprintf("%s/%s", cwd, chrootdir);
}
/* /*
* Unshare from the current process namespaces and set ours. * Unshare from the current process namespaces and set ours.
*/ */