Merge branch 'master' of https://github.com/netblue30/firejail

2 files changed, 15 insertions, 5 deletions

diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 8bebf76af..3812ee7d8 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -4,6 +4,10 @@
 
 # astronomy
 gpredict
+stellarium
+
+# weather/climate
+aweather
 
 # browsers/email
 firefox
@@ -78,6 +82,7 @@ quassel
 xchat
 
 # games
+0ad
 hedgewars
 wesnot
 warzone2100
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) {
 // build a basic read-only filesystem
 void fs_basic_fs(void) {
         if (arg_debug)
-                printf("Mounting read-only /bin, /sbin, /lib, /lib32, /lib64, /usr, /etc, /var\n");
+                printf("Mounting read-only /bin, /sbin, /lib, /lib32, /lib64, /usr");
+        if (!arg_writable_etc) {
+                fs_rdonly("/etc");
+                if (arg_debug) printf(", /etc");
+        }
+        if (!arg_writable_var) {
+                fs_rdonly("/var");
+                if (arg_debug) printf(", /var");
+        }
+        if (arg_debug) printf("\n");
         fs_rdonly("/bin");
         fs_rdonly("/sbin");
         fs_rdonly("/lib");
@@ -734,10 +743,6 @@ void fs_basic_fs(void) {
         fs_rdonly("/lib32");
         fs_rdonly("/libx32");
         fs_rdonly("/usr");
-        if (!arg_writable_etc)
-                fs_rdonly("/etc");
-        if (!arg_writable_var)
-                fs_rdonly("/var");
 
         // update /var directory in order to support multiple sandboxes running on the same root directory
         if (!arg_private_dev)