diff options
author | netblue30 <netblue30@protonmail.com> | 2021-02-24 10:38:41 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-24 10:38:41 -0500 |
commit | 0f8b46ce5a3c8b5efc93440fde054002fecf4468 (patch) | |
tree | 0ce4795379e932a571d83fd5c9294b0ec82acf22 /etc | |
parent | update man profile (diff) | |
parent | ipcalc.profile: move allow include to proper place (diff) | |
download | firejail-0f8b46ce5a3c8b5efc93440fde054002fecf4468.tar.gz firejail-0f8b46ce5a3c8b5efc93440fde054002fecf4468.tar.zst firejail-0f8b46ce5a3c8b5efc93440fde054002fecf4468.zip |
Merge pull request #4002 from kmk3/ipcalc-misc-fixes
ipcalc: misc fixes
Diffstat (limited to 'etc')
-rw-r--r-- | etc/profile-a-l/ipcalc-ng.profile | 4 | ||||
-rw-r--r-- | etc/profile-a-l/ipcalc.profile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/etc/profile-a-l/ipcalc-ng.profile b/etc/profile-a-l/ipcalc-ng.profile index e3fe118c3..3ad0f3a4f 100644 --- a/etc/profile-a-l/ipcalc-ng.profile +++ b/etc/profile-a-l/ipcalc-ng.profile | |||
@@ -4,6 +4,8 @@ quiet | |||
4 | # Persistent local customizations | 4 | # Persistent local customizations |
5 | include ipcalc-ng.local | 5 | include ipcalc-ng.local |
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include globals.local | 7 | # added by included profile |
8 | #include globals.local | ||
8 | 9 | ||
10 | # Redirect | ||
9 | include ipcalc.profile | 11 | include ipcalc.profile |
diff --git a/etc/profile-a-l/ipcalc.profile b/etc/profile-a-l/ipcalc.profile index a75fff60b..4b97b83b7 100644 --- a/etc/profile-a-l/ipcalc.profile +++ b/etc/profile-a-l/ipcalc.profile | |||
@@ -6,12 +6,12 @@ include ipcalc.local | |||
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include globals.local | 7 | include globals.local |
8 | 8 | ||
9 | 9 | # Allow perl (blacklisted by disable-interpreters.inc) | |
10 | include allow-perl.inc | ||
10 | 11 | ||
11 | include disable-common.inc | 12 | include disable-common.inc |
12 | include disable-devel.inc | 13 | include disable-devel.inc |
13 | include disable-exec.inc | 14 | include disable-exec.inc |
14 | include allow-perl.inc | ||
15 | include disable-interpreters.inc | 15 | include disable-interpreters.inc |
16 | include disable-passwdmgr.inc | 16 | include disable-passwdmgr.inc |
17 | include disable-programs.inc | 17 | include disable-programs.inc |