aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2019-02-17 15:18:36 -0600
committerLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2019-02-17 15:19:18 -0600
commit9ddf24fdc336318573ba16eb6b38930f91d6de88 (patch)
treef277445b7528ae83e65b7c2a14a036e1d1a7ea49
parentFixes from review of 2415 (diff)
downloadfirejail-9ddf24fdc336318573ba16eb6b38930f91d6de88.tar.gz
firejail-9ddf24fdc336318573ba16eb6b38930f91d6de88.tar.zst
firejail-9ddf24fdc336318573ba16eb6b38930f91d6de88.zip
Remove 'alternatives' from private-etc if firefox-common is included
-rw-r--r--etc/abrowser.profile2
-rw-r--r--etc/basilisk.profile2
-rw-r--r--etc/cliqz.profile2
-rw-r--r--etc/cyberfox.profile2
-rw-r--r--etc/firefox-common-addons.inc2
-rw-r--r--etc/icecat.profile2
-rw-r--r--etc/iceweasel.profile2
-rw-r--r--etc/palemoon.profile2
-rw-r--r--etc/waterfox.profile2
9 files changed, 9 insertions, 9 deletions
diff --git a/etc/abrowser.profile b/etc/abrowser.profile
index b88d7b5f4..010247c6b 100644
--- a/etc/abrowser.profile
+++ b/etc/abrowser.profile
@@ -14,7 +14,7 @@ whitelist ${HOME}/.cache/mozilla/abrowser
14whitelist ${HOME}/.mozilla 14whitelist ${HOME}/.mozilla
15 15
16# private-etc must first be enabled in firefox-common.profile 16# private-etc must first be enabled in firefox-common.profile
17#private-etc abrowser, alternatives 17#private-etc abrowser
18 18
19 19
20# Redirect 20# Redirect
diff --git a/etc/basilisk.profile b/etc/basilisk.profile
index 21daebaac..5f9fc8ef7 100644
--- a/etc/basilisk.profile
+++ b/etc/basilisk.profile
@@ -20,7 +20,7 @@ seccomp
20 20
21#private-bin basilisk 21#private-bin basilisk
22# private-etc must first be enabled in firefox-common.profile 22# private-etc must first be enabled in firefox-common.profile
23#private-etc alternatives,basilisk 23#private-etc basilisk
24#private-opt basilisk 24#private-opt basilisk
25 25
26# Redirect 26# Redirect
diff --git a/etc/cliqz.profile b/etc/cliqz.profile
index b1e4ea613..d0b8cc0ef 100644
--- a/etc/cliqz.profile
+++ b/etc/cliqz.profile
@@ -17,7 +17,7 @@ whitelist ${HOME}/.cliqz
17whitelist ${HOME}/.config/cliqz 17whitelist ${HOME}/.config/cliqz
18 18
19# private-etc must first be enabled in firefox-common.profile 19# private-etc must first be enabled in firefox-common.profile
20#private-etc alternatives,cliqz 20#private-etc cliqz
21 21
22# Redirect 22# Redirect
23include firefox-common.profile 23include firefox-common.profile
diff --git a/etc/cyberfox.profile b/etc/cyberfox.profile
index 147791d26..fcb448b30 100644
--- a/etc/cyberfox.profile
+++ b/etc/cyberfox.profile
@@ -15,7 +15,7 @@ whitelist ${HOME}/.cache/8pecxstudios
15 15
16# private-bin cyberfox,which,sh,dbus-launch,dbus-send,env 16# private-bin cyberfox,which,sh,dbus-launch,dbus-send,env
17# private-etc must first be enabled in firefox-common.profile 17# private-etc must first be enabled in firefox-common.profile
18#private-etc alternatives,cyberfox 18#private-etc cyberfox
19 19
20# Redirect 20# Redirect
21include firefox-common.profile 21include firefox-common.profile
diff --git a/etc/firefox-common-addons.inc b/etc/firefox-common-addons.inc
index 1932b2f1c..7a0c3e99f 100644
--- a/etc/firefox-common-addons.inc
+++ b/etc/firefox-common-addons.inc
@@ -61,4 +61,4 @@ noblacklist /usr/lib/python3*
61 61
62# Flash plugin 62# Flash plugin
63# private-etc must first be enabled in firefox-common.profile and in profiles including it. 63# private-etc must first be enabled in firefox-common.profile and in profiles including it.
64#private-etc alternatives,adobe 64#private-etc adobe
diff --git a/etc/icecat.profile b/etc/icecat.profile
index 0dae814c0..660343a29 100644
--- a/etc/icecat.profile
+++ b/etc/icecat.profile
@@ -14,7 +14,7 @@ whitelist ${HOME}/.cache/mozilla/icecat
14whitelist ${HOME}/.mozilla 14whitelist ${HOME}/.mozilla
15 15
16# private-etc must first be enabled in firefox-common.profile 16# private-etc must first be enabled in firefox-common.profile
17#private-etc alternatives,icecat 17#private-etc icecat
18 18
19# Redirect 19# Redirect
20include firefox-common.profile 20include firefox-common.profile
diff --git a/etc/iceweasel.profile b/etc/iceweasel.profile
index 4184b23a7..24a2f4cc3 100644
--- a/etc/iceweasel.profile
+++ b/etc/iceweasel.profile
@@ -6,7 +6,7 @@ include iceweasel.local
6include globals.local 6include globals.local
7 7
8# private-etc must first be enabled in firefox-common.profile 8# private-etc must first be enabled in firefox-common.profile
9#private-etc alternatives,iceweasel 9#private-etc iceweasel
10 10
11# Redirect 11# Redirect
12include firefox.profile 12include firefox.profile
diff --git a/etc/palemoon.profile b/etc/palemoon.profile
index e867006e5..11464e6cf 100644
--- a/etc/palemoon.profile
+++ b/etc/palemoon.profile
@@ -19,7 +19,7 @@ seccomp
19 19
20#private-bin palemoon 20#private-bin palemoon
21# private-etc must first be enabled in firefox-common.profile 21# private-etc must first be enabled in firefox-common.profile
22#private-etc alternatives,palemoon 22#private-etc palemoon
23#private-opt palemoon 23#private-opt palemoon
24 24
25# Redirect 25# Redirect
diff --git a/etc/waterfox.profile b/etc/waterfox.profile
index 7875ccb1e..3dc21958d 100644
--- a/etc/waterfox.profile
+++ b/etc/waterfox.profile
@@ -22,7 +22,7 @@ whitelist ${HOME}/.waterfox
22# waterfox requires a shell to launch on Arch. We can possibly remove sh though. 22# waterfox requires a shell to launch on Arch. We can possibly remove sh though.
23#private-bin waterfox,which,sh,dbus-launch,dbus-send,env,bash 23#private-bin waterfox,which,sh,dbus-launch,dbus-send,env,bash
24# private-etc must first be enabled in firefox-common.profile 24# private-etc must first be enabled in firefox-common.profile
25#private-etc alternatives,waterfox 25#private-etc waterfox
26 26
27# Redirect 27# Redirect
28include firefox-common.profile 28include firefox-common.profile