aboutsummaryrefslogtreecommitdiffstats
path: root/etc/inc/disable-common.inc
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-08-11 05:26:05 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-09-08 04:57:37 -0300
commitc6d33375cc34e4e5e527ab43c219adfbc8848c62 (patch)
tree0ccf4359f9b8ab8a5c4e37bd042fbf19314f12a8 /etc/inc/disable-common.inc
parentprofiles: fix some comments (diff)
downloadfirejail-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/inc/disable-common.inc')
-rw-r--r--etc/inc/disable-common.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/disable-common.inc b/etc/inc/disable-common.inc
index 37ca604b7..b688647b5 100644
--- a/etc/inc/disable-common.inc
+++ b/etc/inc/disable-common.inc
@@ -564,7 +564,7 @@ blacklist ${PATH}/bmon
564blacklist ${PATH}/fping 564blacklist ${PATH}/fping
565blacklist ${PATH}/fping6 565blacklist ${PATH}/fping6
566blacklist ${PATH}/hostname 566blacklist ${PATH}/hostname
567# blacklist ${PATH}/ip - breaks --ip=dhcp 567#blacklist ${PATH}/ip # breaks --ip=dhcp
568blacklist ${PATH}/mtr 568blacklist ${PATH}/mtr
569blacklist ${PATH}/mtr-packet 569blacklist ${PATH}/mtr-packet
570blacklist ${PATH}/netstat 570blacklist ${PATH}/netstat