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-a-l/baloo_file.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-a-l/baloo_file.profile')
-rw-r--r-- | etc/profile-a-l/baloo_file.profile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/profile-a-l/baloo_file.profile b/etc/profile-a-l/baloo_file.profile index 084b7c702..de4004724 100644 --- a/etc/profile-a-l/baloo_file.profile +++ b/etc/profile-a-l/baloo_file.profile | |||
@@ -7,10 +7,10 @@ include globals.local | |||
7 | 7 | ||
8 | # Make home directory read-only and allow writing only to ${HOME}/.local/share/baloo | 8 | # Make home directory read-only and allow writing only to ${HOME}/.local/share/baloo |
9 | # Note: Baloo will not be able to update the "first run" key in its configuration files. | 9 | # Note: Baloo will not be able to update the "first run" key in its configuration files. |
10 | # mkdir ${HOME}/.local/share/baloo | 10 | #mkdir ${HOME}/.local/share/baloo |
11 | # read-only ${HOME} | 11 | #read-only ${HOME} |
12 | # read-write ${HOME}/.local/share/baloo | 12 | #read-write ${HOME}/.local/share/baloo |
13 | # ignore read-write | 13 | #ignore read-write |
14 | 14 | ||
15 | noblacklist ${HOME}/.config/baloofilerc | 15 | noblacklist ${HOME}/.config/baloofilerc |
16 | noblacklist ${HOME}/.kde/share/config/baloofilerc | 16 | noblacklist ${HOME}/.kde/share/config/baloofilerc |
@@ -31,7 +31,7 @@ include whitelist-var-common.inc | |||
31 | apparmor | 31 | apparmor |
32 | caps.drop all | 32 | caps.drop all |
33 | machine-id | 33 | machine-id |
34 | # net none | 34 | #net none |
35 | netfilter | 35 | netfilter |
36 | no3d | 36 | no3d |
37 | nodvd | 37 | nodvd |
@@ -46,7 +46,7 @@ novideo | |||
46 | protocol unix | 46 | protocol unix |
47 | # blacklisting of ioprio_set system calls breaks baloo_file | 47 | # blacklisting of ioprio_set system calls breaks baloo_file |
48 | seccomp !ioprio_set | 48 | seccomp !ioprio_set |
49 | # x11 xorg | 49 | #x11 xorg |
50 | 50 | ||
51 | private-bin baloo_file,baloo_file_extractor,baloo_filemetadata_temp_extractor,kbuildsycoca4 | 51 | private-bin baloo_file,baloo_file_extractor,baloo_filemetadata_temp_extractor,kbuildsycoca4 |
52 | private-cache | 52 | private-cache |