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

xbps-uchroot(8): do not remount / unnecessarily.

Browse Source
This commit is contained in:
Juan RP 2014-08-12 07:53:59 +02:00
parent c301cc32e5
commit c5d56bbf83
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,5 +1,8 @@
xbps-0.38 (???): xbps-0.38 (???):
* xbps-uchroot(8): do not remount / unnecessarily; just mount it as private
and nosuid once; this is enough for our use cases.
* xbps-query(8): --show/-S mode now explicitly prints pkg metadata keys * xbps-query(8): --show/-S mode now explicitly prints pkg metadata keys
with the bold ANSI escape code. with the bold ANSI escape code.

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

@ -206,11 +206,8 @@ main(int argc, char **argv)
} }
if (!openvz_container()) { if (!openvz_container()) {
/* Make / a private mount */ /* Make / a private mount */
if (mount(NULL, "/", "none", MS_PRIVATE|MS_REC, NULL) == -1) if (mount(NULL, "/", "none", MS_PRIVATE|MS_REC|MS_NOSUID, NULL) == -1)
die("mount(/, MS_PRIVATE|MS_REC)"); die("mount(/, MS_PRIVATE|MS_REC|MS_NOSUID)");
/* Remount / with nosuid just in case */
if (mount (NULL, "/", "none", MS_PRIVATE|MS_REMOUNT|MS_NOSUID, NULL) == -1)
die("mount(/, MS_PRIVATE|MS_REMOUNT|MS_NOSUID");
} }
/* mount /proc */ /* mount /proc */