summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2018-07-31 00:48:37 -0400
committerLibravatar Tad <tad@spotco.us>2018-07-31 00:54:55 -0400
commit3c2a7e4c91aa030218b5ad7fa6291d16f1d51b53 (patch)
treecdc43b9a5e257b19ff0839a83df84db90fa5d9fd
parentAdd XDG variable support to blacklist and read-only. (diff)
downloadfirejail-3c2a7e4c91aa030218b5ad7fa6291d16f1d51b53.tar.gz
firejail-3c2a7e4c91aa030218b5ad7fa6291d16f1d51b53.tar.zst
firejail-3c2a7e4c91aa030218b5ad7fa6291d16f1d51b53.zip
Sound fixes
- Adds machine-id to all profiles with 'private-etc *pulse*' - This fixes sound under many profiles - This is related to #2037, except this adds etc machine-id not spoofed machine-id - Spoofed machine-id seems to break pulseaudio on some systems - We already do this in profiles like firefox-common (see the note in it) - pulseaudio's enable-shm set to yes or no doesn't fix this issue on systems where it occurs - We can revert this in the future if we find a fix - Command used: grep -e music -e videos -e audio -e pulse -e asound -il $(grep "machine-id" -iL $(grep "private-etc" . -Rl))
-rw-r--r--etc/Viber.profile2
-rw-r--r--etc/amarok.profile2
-rw-r--r--etc/ardour5.profile2
-rw-r--r--etc/cmus.profile2
-rw-r--r--etc/gnome-music.profile2
-rw-r--r--etc/goobox.profile2
-rw-r--r--etc/minetest.profile2
-rw-r--r--etc/musixmatch.profile2
-rw-r--r--etc/parole.profile2
-rw-r--r--etc/ppsspp.profile2
-rw-r--r--etc/qupzilla.profile2
-rw-r--r--etc/seamonkey.profile2
-rw-r--r--etc/slack.profile2
-rw-r--r--etc/totem.profile2
-rw-r--r--etc/xonotic.profile2
-rw-r--r--etc/xplayer.profile2
16 files changed, 16 insertions, 16 deletions
diff --git a/etc/Viber.profile b/etc/Viber.profile
index 6a58da8c9..cb9d01e03 100644
--- a/etc/Viber.profile
+++ b/etc/Viber.profile
@@ -32,7 +32,7 @@ shell none
32 32
33disable-mnt 33disable-mnt
34private-bin sh,bash,dig,awk,Viber 34private-bin sh,bash,dig,awk,Viber
35private-etc hosts,fonts,mailcap,resolv.conf,X11,pulse,alternatives,localtime,nsswitch.conf,ssl,proxychains.conf,pki,ca-certificates,crypto-policies 35private-etc hosts,fonts,mailcap,resolv.conf,X11,pulse,alternatives,localtime,nsswitch.conf,ssl,proxychains.conf,pki,ca-certificates,crypto-policies,machine-id,asound.conf
36private-tmp 36private-tmp
37 37
38noexec ${HOME} 38noexec ${HOME}
diff --git a/etc/amarok.profile b/etc/amarok.profile
index aff78e210..dab23c218 100644
--- a/etc/amarok.profile
+++ b/etc/amarok.profile
@@ -29,5 +29,5 @@ shell none
29 29
30# private-bin amarok 30# private-bin amarok
31private-dev 31private-dev
32# private-etc none 32# private-etc none,machine-id,pulse,asound.conf
33private-tmp 33private-tmp
diff --git a/etc/ardour5.profile b/etc/ardour5.profile
index aaac62bc8..99649cc3f 100644
--- a/etc/ardour5.profile
+++ b/etc/ardour5.profile
@@ -35,7 +35,7 @@ shell none
35#private-bin sh,ardour4,ardour5,ardour5-copy-mixer,ardour5-export,ardour5-fix_bbtppq,grep,sed,ldd,nm 35#private-bin sh,ardour4,ardour5,ardour5-copy-mixer,ardour5-export,ardour5-fix_bbtppq,grep,sed,ldd,nm
36private-cache 36private-cache
37private-dev 37private-dev
38#private-etc pulse,X11,alternatives,ardour4,ardour5,fonts 38#private-etc pulse,X11,alternatives,ardour4,ardour5,fonts,machine-id,asound.conf
39private-tmp 39private-tmp
40 40
41noexec ${HOME} 41noexec ${HOME}
diff --git a/etc/cmus.profile b/etc/cmus.profile
index 3331bde22..36478ef85 100644
--- a/etc/cmus.profile
+++ b/etc/cmus.profile
@@ -26,4 +26,4 @@ seccomp
26shell none 26shell none
27 27
28private-bin cmus 28private-bin cmus
29private-etc group 29private-etc group,machine-id,pulse,asound.conf
diff --git a/etc/gnome-music.profile b/etc/gnome-music.profile
index 90fb9814f..15710b363 100644
--- a/etc/gnome-music.profile
+++ b/etc/gnome-music.profile
@@ -38,7 +38,7 @@ tracelog
38 38
39private-bin gnome-music,python* 39private-bin gnome-music,python*
40private-dev 40private-dev
41# private-etc fonts 41# private-etc fonts,machine-id,pulse,asound.conf
42private-tmp 42private-tmp
43 43
44noexec ${HOME} 44noexec ${HOME}
diff --git a/etc/goobox.profile b/etc/goobox.profile
index 5e5aad95b..680e14a49 100644
--- a/etc/goobox.profile
+++ b/etc/goobox.profile
@@ -29,5 +29,5 @@ tracelog
29 29
30# private-bin goobox 30# private-bin goobox
31private-dev 31private-dev
32# private-etc fonts 32# private-etc fonts,machine-id,pulse,asound.conf
33# private-tmp 33# private-tmp
diff --git a/etc/minetest.profile b/etc/minetest.profile
index cdbf21935..6497fa9ba 100644
--- a/etc/minetest.profile
+++ b/etc/minetest.profile
@@ -34,7 +34,7 @@ disable-mnt
34private-bin minetest 34private-bin minetest
35private-dev 35private-dev
36# private-etc needs to be updated, see #1702 36# private-etc needs to be updated, see #1702
37#private-etc asound.conf,ca-certificates,drirc,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pulse,resolv.conf,ssl,pki,crypto-policies 37#private-etc asound.conf,ca-certificates,drirc,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pulse,resolv.conf,ssl,pki,crypto-policies,machine-id
38private-tmp 38private-tmp
39 39
40noexec ${HOME} 40noexec ${HOME}
diff --git a/etc/musixmatch.profile b/etc/musixmatch.profile
index bc8965431..b572f13d2 100644
--- a/etc/musixmatch.profile
+++ b/etc/musixmatch.profile
@@ -30,7 +30,7 @@ seccomp
30 30
31disable-mnt 31disable-mnt
32private-dev 32private-dev
33private-etc none 33private-etc none,machine-id,pulse,asound.conf
34 34
35noexec ${HOME} 35noexec ${HOME}
36noexec /tmp 36noexec /tmp
diff --git a/etc/parole.profile b/etc/parole.profile
index f98703bd6..17d31af15 100644
--- a/etc/parole.profile
+++ b/etc/parole.profile
@@ -26,4 +26,4 @@ shell none
26 26
27private-bin parole,dbus-launch 27private-bin parole,dbus-launch
28private-cache 28private-cache
29private-etc passwd,group,fonts 29private-etc passwd,group,fonts,machine-id,pulse,asound.conf
diff --git a/etc/ppsspp.profile b/etc/ppsspp.profile
index 073108464..3a40b6260 100644
--- a/etc/ppsspp.profile
+++ b/etc/ppsspp.profile
@@ -36,7 +36,7 @@ shell none
36 36
37# private-dev is disabled to allow controller support 37# private-dev is disabled to allow controller support
38#private-dev 38#private-dev
39private-etc asound.conf,ca-certificates,drirc,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pulse,resolv.conf,ssl,pki,crypto-policies 39private-etc asound.conf,ca-certificates,drirc,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pulse,resolv.conf,ssl,pki,crypto-policies,machine-id
40private-opt ppsspp 40private-opt ppsspp
41private-tmp 41private-tmp
42 42
diff --git a/etc/qupzilla.profile b/etc/qupzilla.profile
index 947689d96..da1ca2281 100644
--- a/etc/qupzilla.profile
+++ b/etc/qupzilla.profile
@@ -33,7 +33,7 @@ seccomp.drop @clock,@cpu-emulation,@debug,@module,@obsolete,@raw-io,@reboot,@res
33# tracelog 33# tracelog
34 34
35private-dev 35private-dev
36# private-etc passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,gtk-2.0,pango,fonts,adobe,mime.types,mailcap,asound.conf,pulse 36# private-etc passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,gtk-2.0,pango,fonts,adobe,mime.types,mailcap,asound.conf,pulse,machine-id
37# private-tmp - interferes with the opening of downloaded files 37# private-tmp - interferes with the opening of downloaded files
38 38
39noexec ${HOME} 39noexec ${HOME}
diff --git a/etc/seamonkey.profile b/etc/seamonkey.profile
index 423863cc2..dc2fd8e30 100644
--- a/etc/seamonkey.profile
+++ b/etc/seamonkey.profile
@@ -47,4 +47,4 @@ seccomp
47tracelog 47tracelog
48 48
49disable-mnt 49disable-mnt
50# private-etc passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,gtk-2.0,pango,fonts,iceweasel,firefox,adobe,mime.types,mailcap,asound.conf,pulse 50# private-etc passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,gtk-2.0,pango,fonts,iceweasel,firefox,adobe,mime.types,mailcap,asound.conf,pulse,machine-id
diff --git a/etc/slack.profile b/etc/slack.profile
index 13106255b..91bf0a722 100644
--- a/etc/slack.profile
+++ b/etc/slack.profile
@@ -37,5 +37,5 @@ shell none
37disable-mnt 37disable-mnt
38private-bin slack,locale 38private-bin slack,locale
39private-dev 39private-dev
40private-etc asound.conf,ca-certificates,fonts,group,passwd,pulse,resolv.conf,ssl,ld.so.conf,ld.so.cache,localtime,pki,crypto-policies 40private-etc asound.conf,ca-certificates,fonts,group,passwd,pulse,resolv.conf,ssl,ld.so.conf,ld.so.cache,localtime,pki,crypto-policies,machine-id
41private-tmp 41private-tmp
diff --git a/etc/totem.profile b/etc/totem.profile
index 3ac25440b..911999665 100644
--- a/etc/totem.profile
+++ b/etc/totem.profile
@@ -33,7 +33,7 @@ shell none
33private-bin totem 33private-bin totem
34private-cache 34private-cache
35private-dev 35private-dev
36# private-etc fonts 36# private-etc fonts,machine-id,pulse,asound.conf
37private-tmp 37private-tmp
38 38
39noexec ${HOME} 39noexec ${HOME}
diff --git a/etc/xonotic.profile b/etc/xonotic.profile
index 1d2493f36..30f5c735d 100644
--- a/etc/xonotic.profile
+++ b/etc/xonotic.profile
@@ -34,7 +34,7 @@ disable-mnt
34private-bin bash,blind-id,darkplaces-glx,darkplaces-sdl,dirname,grep,ldd,netstat,ps,readlink,sh,uname,xonotic,xonotic-glx,xonotic-linux32-dedicated,xonotic-linux32-glx,xonotic-linux32-sdl,xonotic-linux64-dedicated,xonotic-linux64-glx,xonotic-linux64-sdl,xonotic-sdl 34private-bin bash,blind-id,darkplaces-glx,darkplaces-sdl,dirname,grep,ldd,netstat,ps,readlink,sh,uname,xonotic,xonotic-glx,xonotic-linux32-dedicated,xonotic-linux32-glx,xonotic-linux32-sdl,xonotic-linux64-dedicated,xonotic-linux64-glx,xonotic-linux64-sdl,xonotic-sdl
35private-dev 35private-dev
36# private-etc breaks audio on some distros 36# private-etc breaks audio on some distros
37#private-etc asound.conf,ca-certificates,drirc,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pulse,resolv.conf,ssl,pki,crypto-policies 37#private-etc asound.conf,ca-certificates,drirc,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pulse,resolv.conf,ssl,pki,crypto-policies,machine-id
38private-tmp 38private-tmp
39 39
40noexec ${HOME} 40noexec ${HOME}
diff --git a/etc/xplayer.profile b/etc/xplayer.profile
index 46579ead8..5873e2436 100644
--- a/etc/xplayer.profile
+++ b/etc/xplayer.profile
@@ -39,7 +39,7 @@ tracelog
39 39
40private-bin xplayer,xplayer-audio-preview,xplayer-video-thumbnailer 40private-bin xplayer,xplayer-audio-preview,xplayer-video-thumbnailer
41private-dev 41private-dev
42# private-etc fonts 42# private-etc fonts,machine-id,pulse,asound.conf
43private-tmp 43private-tmp
44 44
45noexec ${HOME} 45noexec ${HOME}