aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-04-19 08:17:45 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-04-19 08:17:45 -0400
commit4000cf81f779a0233a895c6386905f9cc617b28f (patch)
treefbff08669f193ff9fb7efd6f7cba69d76339afb4
parentMerge pull request #453 from Fred-Barclay/Astronomy (diff)
parentfs.c: correct debug message (diff)
downloadfirejail-4000cf81f779a0233a895c6386905f9cc617b28f.tar.gz
firejail-4000cf81f779a0233a895c6386905f9cc617b28f.tar.zst
firejail-4000cf81f779a0233a895c6386905f9cc617b28f.zip
Merge pull request #454 from avoidr/correct_debug_msg
fs.c: correct debug message
-rw-r--r--src/firejail/fs.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index af1ddf93b..4c2510021 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -726,7 +726,16 @@ static void disable_firejail_config(void) {
726// build a basic read-only filesystem 726// build a basic read-only filesystem
727void fs_basic_fs(void) { 727void fs_basic_fs(void) {
728 if (arg_debug) 728 if (arg_debug)
729 printf("Mounting read-only /bin, /sbin, /lib, /lib32, /lib64, /usr, /etc, /var\n"); 729 printf("Mounting read-only /bin, /sbin, /lib, /lib32, /lib64, /usr");
730 if (!arg_writable_etc) {
731 fs_rdonly("/etc");
732 if (arg_debug) printf(", /etc");
733 }
734 if (!arg_writable_var) {
735 fs_rdonly("/var");
736 if (arg_debug) printf(", /var");
737 }
738 if (arg_debug) printf("\n");
730 fs_rdonly("/bin"); 739 fs_rdonly("/bin");
731 fs_rdonly("/sbin"); 740 fs_rdonly("/sbin");
732 fs_rdonly("/lib"); 741 fs_rdonly("/lib");
@@ -734,10 +743,6 @@ void fs_basic_fs(void) {
734 fs_rdonly("/lib32"); 743 fs_rdonly("/lib32");
735 fs_rdonly("/libx32"); 744 fs_rdonly("/libx32");
736 fs_rdonly("/usr"); 745 fs_rdonly("/usr");
737 if (!arg_writable_etc)
738 fs_rdonly("/etc");
739 if (!arg_writable_var)
740 fs_rdonly("/var");
741 746
742 // update /var directory in order to support multiple sandboxes running on the same root directory 747 // update /var directory in order to support multiple sandboxes running on the same root directory
743 if (!arg_private_dev) 748 if (!arg_private_dev)