diff options
author | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-08-04 19:10:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-04 19:10:09 -0500 |
commit | 225ec91e76279cf7a405ca86f4f4db87ca68740e (patch) | |
tree | 144005578267a1b1768673be1f5fc6370cdb4996 | |
parent | .gitignore update (diff) | |
parent | Update firecfg.config and add a wireshark-* alias (diff) | |
download | firejail-225ec91e76279cf7a405ca86f4f4db87ca68740e.tar.gz firejail-225ec91e76279cf7a405ca86f4f4db87ca68740e.tar.zst firejail-225ec91e76279cf7a405ca86f4f4db87ca68740e.zip |
Merge pull request #1435 from SpotComms/fc
Update firecfg.config and add a wireshark-* alias
-rw-r--r-- | etc/wireshark-gtk.profile | 8 | ||||
-rw-r--r-- | etc/wireshark-qt.profile | 8 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 27 |
3 files changed, 37 insertions, 6 deletions
diff --git a/etc/wireshark-gtk.profile b/etc/wireshark-gtk.profile new file mode 100644 index 000000000..5cc2ae2a1 --- /dev/null +++ b/etc/wireshark-gtk.profile | |||
@@ -0,0 +1,8 @@ | |||
1 | # Persistent global definitions go here | ||
2 | include /etc/firejail/globals.local | ||
3 | |||
4 | # This file is overwritten during software install. | ||
5 | # Persistent customizations should go in a .local file. | ||
6 | include /etc/firejail/wireshark-gtk.local | ||
7 | |||
8 | include /etc/firejail/wireshark.profile | ||
diff --git a/etc/wireshark-qt.profile b/etc/wireshark-qt.profile new file mode 100644 index 000000000..f6f26a6b3 --- /dev/null +++ b/etc/wireshark-qt.profile | |||
@@ -0,0 +1,8 @@ | |||
1 | # Persistent global definitions go here | ||
2 | include /etc/firejail/globals.local | ||
3 | |||
4 | # This file is overwritten during software install. | ||
5 | # Persistent customizations should go in a .local file. | ||
6 | include /etc/firejail/wireshark-qt.local | ||
7 | |||
8 | include /etc/firejail/wireshark.profile | ||
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index 299b165f6..410e12e46 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -7,6 +7,7 @@ abrowser | |||
7 | akregator | 7 | akregator |
8 | amarok | 8 | amarok |
9 | android-studio | 9 | android-studio |
10 | apktool | ||
10 | arduino | 11 | arduino |
11 | ark | 12 | ark |
12 | arm | 13 | arm |
@@ -18,11 +19,12 @@ audacious | |||
18 | audacity | 19 | audacity |
19 | aweather | 20 | aweather |
20 | baloo_file | 21 | baloo_file |
22 | baobab | ||
21 | bibletime | 23 | bibletime |
22 | bitlbee | 24 | bitlbee |
23 | bleachbit | 25 | bleachbit |
24 | bless | ||
25 | blender | 26 | blender |
27 | bless | ||
26 | brasero | 28 | brasero |
27 | brave | 29 | brave |
28 | calibre | 30 | calibre |
@@ -31,8 +33,8 @@ cherrytree | |||
31 | chromium | 33 | chromium |
32 | chromium-browser | 34 | chromium-browser |
33 | claws-mail | 35 | claws-mail |
34 | clipit | ||
35 | clementine | 36 | clementine |
37 | clipit | ||
36 | cmus | 38 | cmus |
37 | conkeror | 39 | conkeror |
38 | corebird | 40 | corebird |
@@ -43,6 +45,7 @@ Cyberfox | |||
43 | darktable | 45 | darktable |
44 | deadbeef | 46 | deadbeef |
45 | deluge | 47 | deluge |
48 | dex2jar | ||
46 | dia | 49 | dia |
47 | digikam | 50 | digikam |
48 | dillo | 51 | dillo |
@@ -73,8 +76,9 @@ firefox-esr | |||
73 | flashpeak-slimjet | 76 | flashpeak-slimjet |
74 | flowblade | 77 | flowblade |
75 | fontforge | 78 | fontforge |
76 | frozen-bubble | ||
77 | FossaMail | 79 | FossaMail |
80 | franz | ||
81 | frozen-bubble | ||
78 | gajim | 82 | gajim |
79 | galculator | 83 | galculator |
80 | geany | 84 | geany |
@@ -84,6 +88,7 @@ geeqie | |||
84 | ghb | 88 | ghb |
85 | gimp | 89 | gimp |
86 | gimp-2.8 | 90 | gimp-2.8 |
91 | gitg | ||
87 | gitter | 92 | gitter |
88 | gjs | 93 | gjs |
89 | globaltime | 94 | globaltime |
@@ -115,6 +120,7 @@ gucharmap | |||
115 | gwenview | 120 | gwenview |
116 | handbrake | 121 | handbrake |
117 | handbrake-gtk | 122 | handbrake-gtk |
123 | hashcat | ||
118 | hedgewars | 124 | hedgewars |
119 | hexchat | 125 | hexchat |
120 | highlight | 126 | highlight |
@@ -138,6 +144,7 @@ keepass2 | |||
138 | keepassx | 144 | keepassx |
139 | keepassx2 | 145 | keepassx2 |
140 | keepassxc | 146 | keepassxc |
147 | kino | ||
141 | kmail | 148 | kmail |
142 | knotes | 149 | knotes |
143 | kodi | 150 | kodi |
@@ -158,8 +165,8 @@ lomath | |||
158 | loweb | 165 | loweb |
159 | lowriter | 166 | lowriter |
160 | luminance-hdr | 167 | luminance-hdr |
161 | lxmusic | ||
162 | lximage-qt | 168 | lximage-qt |
169 | lxmusic | ||
163 | lynx | 170 | lynx |
164 | mate-calc | 171 | mate-calc |
165 | mate-calculator | 172 | mate-calculator |
@@ -183,6 +190,7 @@ mutt | |||
183 | nautilus | 190 | nautilus |
184 | netsurf | 191 | netsurf |
185 | nylas | 192 | nylas |
193 | obs | ||
186 | odt2txt | 194 | odt2txt |
187 | okular | 195 | okular |
188 | open-invaders | 196 | open-invaders |
@@ -195,6 +203,7 @@ parole | |||
195 | pdfsam | 203 | pdfsam |
196 | pdftotext | 204 | pdftotext |
197 | peek | 205 | peek |
206 | picard | ||
198 | pidgin | 207 | pidgin |
199 | pingus | 208 | pingus |
200 | pithos | 209 | pithos |
@@ -214,22 +223,27 @@ qupzilla | |||
214 | qutebrowser | 223 | qutebrowser |
215 | rambox | 224 | rambox |
216 | ranger | 225 | ranger |
226 | remmina | ||
217 | rhythmbox | 227 | rhythmbox |
228 | riot-web | ||
218 | ristretto | 229 | ristretto |
219 | rtorrent | 230 | rtorrent |
220 | scribus | 231 | scribus |
232 | sdat2img | ||
221 | seamonkey | 233 | seamonkey |
222 | seamonkey-bin | 234 | seamonkey-bin |
235 | silentarmy | ||
223 | simple-scan | 236 | simple-scan |
224 | simutrans | 237 | simutrans |
225 | silentarmy | ||
226 | skanlite | 238 | skanlite |
227 | skype | 239 | skype |
228 | skypeforlinux | 240 | skypeforlinux |
229 | slack | 241 | slack |
230 | smplayer | 242 | smplayer |
231 | soffice | 243 | soffice |
244 | soundconverter | ||
232 | spotify | 245 | spotify |
246 | sqlitebrowser | ||
233 | ssh | 247 | ssh |
234 | ssh-agent | 248 | ssh-agent |
235 | start-tor-browser | 249 | start-tor-browser |
@@ -273,6 +287,8 @@ wine | |||
273 | wire | 287 | wire |
274 | Wire | 288 | Wire |
275 | wireshark | 289 | wireshark |
290 | wireshark-gtk | ||
291 | wireshark-qt | ||
276 | xchat | 292 | xchat |
277 | xed | 293 | xed |
278 | Xephyr | 294 | Xephyr |
@@ -292,4 +308,3 @@ xviewer | |||
292 | youtube-dl | 308 | youtube-dl |
293 | zathura | 309 | zathura |
294 | zoom | 310 | zoom |
295 | |||