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/default.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/default.profile')
-rw-r--r-- | etc/profile-a-l/default.profile | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/etc/profile-a-l/default.profile b/etc/profile-a-l/default.profile index 377c4e2e3..c071da4b7 100644 --- a/etc/profile-a-l/default.profile +++ b/etc/profile-a-l/default.profile | |||
@@ -9,54 +9,54 @@ include globals.local | |||
9 | # depending on your usage, you can enable some of the commands below: | 9 | # depending on your usage, you can enable some of the commands below: |
10 | 10 | ||
11 | include disable-common.inc | 11 | include disable-common.inc |
12 | # include disable-devel.inc | 12 | #include disable-devel.inc |
13 | # include disable-exec.inc | 13 | #include disable-exec.inc |
14 | # include disable-interpreters.inc | 14 | #include disable-interpreters.inc |
15 | include disable-programs.inc | 15 | include disable-programs.inc |
16 | # include disable-shell.inc | 16 | #include disable-shell.inc |
17 | # include disable-write-mnt.inc | 17 | #include disable-write-mnt.inc |
18 | # include disable-xdg.inc | 18 | #include disable-xdg.inc |
19 | 19 | ||
20 | # include whitelist-common.inc | 20 | #include whitelist-common.inc |
21 | # include whitelist-runuser-common.inc | 21 | #include whitelist-runuser-common.inc |
22 | # include whitelist-usr-share-common.inc | 22 | #include whitelist-usr-share-common.inc |
23 | # include whitelist-var-common.inc | 23 | #include whitelist-var-common.inc |
24 | 24 | ||
25 | # apparmor | 25 | #apparmor |
26 | caps.drop all | 26 | caps.drop all |
27 | # ipc-namespace | 27 | #ipc-namespace |
28 | # machine-id | 28 | #machine-id |
29 | # net none | 29 | #net none |
30 | netfilter | 30 | netfilter |
31 | # no3d | 31 | #no3d |
32 | # nodvd | 32 | #nodvd |
33 | # nogroups | 33 | #nogroups |
34 | noinput | 34 | noinput |
35 | nonewprivs | 35 | nonewprivs |
36 | noroot | 36 | noroot |
37 | # nosound | 37 | #nosound |
38 | notv | 38 | notv |
39 | # nou2f | 39 | #nou2f |
40 | novideo | 40 | novideo |
41 | protocol unix,inet,inet6 | 41 | protocol unix,inet,inet6 |
42 | seccomp | 42 | seccomp |
43 | # tracelog | 43 | #tracelog |
44 | 44 | ||
45 | # disable-mnt | 45 | #disable-mnt |
46 | # private | 46 | #private |
47 | # private-bin program | 47 | #private-bin program |
48 | # private-cache | 48 | #private-cache |
49 | private-dev | 49 | private-dev |
50 | # see /usr/share/doc/firejail/profile.template for more common private-etc paths. | 50 | # see /usr/share/doc/firejail/profile.template for more common private-etc paths. |
51 | # private-etc alternatives,fonts,machine-id | 51 | #private-etc alternatives,fonts,machine-id |
52 | # private-lib | 52 | #private-lib |
53 | # private-opt none | 53 | #private-opt none |
54 | private-tmp | 54 | private-tmp |
55 | 55 | ||
56 | # dbus-user none | 56 | #dbus-user none |
57 | # dbus-system none | 57 | #dbus-system none |
58 | 58 | ||
59 | # deterministic-shutdown | 59 | #deterministic-shutdown |
60 | # memory-deny-write-execute | 60 | #memory-deny-write-execute |
61 | # read-only ${HOME} | 61 | #read-only ${HOME} |
62 | restrict-namespaces | 62 | restrict-namespaces |