aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar glitsj16 <glitsj16@users.noreply.github.com>2020-05-04 18:48:42 +0000
committerLibravatar GitHub <noreply@github.com>2020-05-04 18:48:42 +0000
commit276f250e2fae884d421cff52f3b7ac7c9762cf79 (patch)
tree5167a1917db2c4176f917534b594a1b3ac08f21f
parentMerge pull request #3395 from matu3ba/template_bug (diff)
downloadfirejail-276f250e2fae884d421cff52f3b7ac7c9762cf79.tar.gz
firejail-276f250e2fae884d421cff52f3b7ac7c9762cf79.tar.zst
firejail-276f250e2fae884d421cff52f3b7ac7c9762cf79.zip
Follow-up for #3326 (#3397)
* use the new dbus format in chromium-common.profile * use new dbus format in firejail.config Now that #3326 landed I think it might be less confusing to keep using the --nodbus wording. Couldn't come up with a better alternative (yet), so this might need future improvements. * block dbus system bus Blocking the system bus shouldn't affect password functionality etc, as that uses the session bus.
-rw-r--r--etc/firejail.config2
-rw-r--r--etc/profile-a-l/chromium-common.profile5
2 files changed, 5 insertions, 2 deletions
diff --git a/etc/firejail.config b/etc/firejail.config
index 589109c64..b2a96612f 100644
--- a/etc/firejail.config
+++ b/etc/firejail.config
@@ -27,7 +27,7 @@
27# Enable or disable chroot support, default enabled. 27# Enable or disable chroot support, default enabled.
28# chroot yes 28# chroot yes
29 29
30# Enable or disable dbus handling by --nodbus flag, default enabled. 30# Enable or disable dbus handling, default enabled.
31# dbus yes 31# dbus yes
32 32
33# Disable /mnt, /media, /run/mount and /run/media access. By default access 33# Disable /mnt, /media, /run/mount and /run/media access. By default access
diff --git a/etc/profile-a-l/chromium-common.profile b/etc/profile-a-l/chromium-common.profile
index c54fb0e19..899400d25 100644
--- a/etc/profile-a-l/chromium-common.profile
+++ b/etc/profile-a-l/chromium-common.profile
@@ -29,7 +29,6 @@ include whitelist-var-common.inc
29apparmor 29apparmor
30caps.keep sys_admin,sys_chroot 30caps.keep sys_admin,sys_chroot
31netfilter 31netfilter
32# nodbus - prevents access to passwords saved in GNOME Keyring and KWallet, also breaks Gnome connector
33nodvd 32nodvd
34nogroups 33nogroups
35notv 34notv
@@ -40,5 +39,9 @@ disable-mnt
40?BROWSER_DISABLE_U2F: private-dev 39?BROWSER_DISABLE_U2F: private-dev
41# private-tmp - problems with multiple browser sessions 40# private-tmp - problems with multiple browser sessions
42 41
42# prevents access to passwords saved in GNOME Keyring and KWallet, also breaks Gnome connector
43# dbus-user none
44dbus-system none
45
43# the file dialog needs to work without d-bus 46# the file dialog needs to work without d-bus
44?HAS_NODBUS: env NO_CHROME_KDE_FILE_DIALOG=1 47?HAS_NODBUS: env NO_CHROME_KDE_FILE_DIALOG=1