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

xbps-uchroot: try to bind mount /proc if a new instance fails.

Browse Source 
This should help uchroot to work in the travis-ci containers (hopefully).
This commit is contained in:
Juan RP 2015-04-11 08:47:40 +02:00
parent 3ef9350787
commit f78c2986d4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/xbps-uchroot/main.c
View File

@ -275,8 +275,10 @@ main(int argc, char **argv)
/* mount /proc */ /* mount /proc */
snprintf(mountdir, sizeof(mountdir), "%s/proc", chrootdir); snprintf(mountdir, sizeof(mountdir), "%s/proc", chrootdir);
if (mount("proc", mountdir, "proc", MS_MGC_VAL|MS_PRIVATE, NULL) == -1) if (mount("proc", mountdir, "proc", MS_MGC_VAL|MS_PRIVATE, NULL) == -1) {
die("Failed to mount %s", mountdir); /* try bind mount */
bindmount(ruid, chrootdir, "/proc", NULL);
}
/* bind mount /sys */ /* bind mount /sys */
bindmount(ruid, chrootdir, "/sys", NULL); bindmount(ruid, chrootdir, "/sys", NULL);