diff options
author | 2023-08-11 05:26:05 -0300 | |
---|---|---|
committer | 2023-09-08 04:57:37 -0300 | |
commit | c6d33375cc34e4e5e527ab43c219adfbc8848c62 (patch) | |
tree | 0ccf4359f9b8ab8a5c4e37bd042fbf19314f12a8 /etc/profile-m-z/wireshark.profile | |
parent | profiles: fix some comments (diff) | |
download | firejail-c6d33375cc34e4e5e527ab43c219adfbc8848c62.tar.gz firejail-c6d33375cc34e4e5e527ab43c219adfbc8848c62.tar.zst firejail-c6d33375cc34e4e5e527ab43c219adfbc8848c62.zip |
profiles: fix commented code and eol comments
Main changes:
* Remove the space after `#` for commented code lines to distinguish
them from normal comments
* Use `#` instead of `-` for comments at the end of the line so that
commented code lines work after being uncommented
Commands used to search and replace:
arg0="$(cat contrib/syntax/lists/profile_commands_arg0.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
arg1="$(cat contrib/syntax/lists/profile_commands_arg1.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
git ls-files -z -- etc/inc etc/profile* | xargs -0 -I '{}' \
sh -c "printf '%s\n' \"\$(sed -E \
-e 's/^# ($arg0)( [#-]-? .*)?\$/#\\1\\2/' \
-e 's/^# ($arg1)( [^ ]*)?( [#-]-? .*)?\$/#\\1\\2\\3/' \
-e 's/^# (whitelist \\$)/#\\1/' \
-e 's/^(#[^ ].+) --? /\\1 # /' \
'{}')\" >'{}'"
Commands used to check for leftover entries:
arg0="$(cat contrib/syntax/lists/profile_commands_arg0.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
arg1="$(cat contrib/syntax/lists/profile_commands_arg1.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
git grep -E "^# ($arg0|$arg1)( +|$)" -- etc/inc etc/profile*
See also commit 30f9ad908 ("build: improve comments in firecfg.config",
2023-08-05) / PR #5942.
Diffstat (limited to 'etc/profile-m-z/wireshark.profile')
-rw-r--r-- | etc/profile-m-z/wireshark.profile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/profile-m-z/wireshark.profile b/etc/profile-m-z/wireshark.profile index dedb78d11..7caac217f 100644 --- a/etc/profile-m-z/wireshark.profile +++ b/etc/profile-m-z/wireshark.profile | |||
@@ -25,14 +25,14 @@ include whitelist-usr-share-common.inc | |||
25 | include whitelist-var-common.inc | 25 | include whitelist-var-common.inc |
26 | 26 | ||
27 | apparmor | 27 | apparmor |
28 | # caps.drop all | 28 | #caps.drop all |
29 | caps.keep dac_override,dac_read_search,net_admin,net_raw | 29 | caps.keep dac_override,dac_read_search,net_admin,net_raw |
30 | netfilter | 30 | netfilter |
31 | no3d | 31 | no3d |
32 | # nogroups - breaks network traffic capture for unprivileged users | 32 | #nogroups # breaks network traffic capture for unprivileged users |
33 | noinput | 33 | noinput |
34 | # nonewprivs - breaks network traffic capture for unprivileged users | 34 | #nonewprivs # breaks network traffic capture for unprivileged users |
35 | # noroot | 35 | #noroot |
36 | nodvd | 36 | nodvd |
37 | nosound | 37 | nosound |
38 | notv | 38 | notv |
@@ -43,12 +43,12 @@ novideo | |||
43 | #seccomp | 43 | #seccomp |
44 | tracelog | 44 | tracelog |
45 | 45 | ||
46 | # private-bin wireshark | 46 | #private-bin wireshark |
47 | private-cache | 47 | private-cache |
48 | # private-dev prevents (some) interfaces from being shown. | 48 | # private-dev prevents (some) interfaces from being shown. |
49 | # Add the below line to your wirehsark.local if you only want to inspect pcap files. | 49 | # Add the below line to your wirehsark.local if you only want to inspect pcap files. |
50 | #private-dev | 50 | #private-dev |
51 | # private-etc alternatives,ca-certificates,crypto-policies,fonts,group,hosts,machine-id,passwd,pki,resolv.conf,ssl | 51 | #private-etc alternatives,ca-certificates,crypto-policies,fonts,group,hosts,machine-id,passwd,pki,resolv.conf,ssl |
52 | private-tmp | 52 | private-tmp |
53 | 53 | ||
54 | dbus-user none | 54 | dbus-user none |