diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2021-01-29 18:23:17 -0300 |
---|---|---|
committer | rusty-snake <41237666+rusty-snake@users.noreply.github.com> | 2021-02-08 19:22:57 +0000 |
commit | c2e40c6d4e9c76304c3f49e04019871322fa6b77 (patch) | |
tree | 2d55f6fc268b1e52698759f4d0a693e068e1e7c2 | |
parent | formating (diff) | |
download | firejail-c2e40c6d4e9c76304c3f49e04019871322fa6b77.tar.gz firejail-c2e40c6d4e9c76304c3f49e04019871322fa6b77.tar.zst firejail-c2e40c6d4e9c76304c3f49e04019871322fa6b77.zip |
archivers: move archiver-common.inc include to the bottom
And mark it as a redirect profile.
This is done so when including other *-common.inc profiles, such as
firefox-common.profile.
-rw-r--r-- | etc/profile-a-l/7z.profile | 3 | ||||
-rw-r--r-- | etc/profile-a-l/ar.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/atool.profile | 4 | ||||
-rw-r--r-- | etc/profile-a-l/bsdtar.profile | 5 | ||||
-rw-r--r-- | etc/profile-a-l/cpio.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/gzip.profile | 1 | ||||
-rw-r--r-- | etc/profile-m-z/tar.profile | 9 | ||||
-rw-r--r-- | etc/profile-m-z/unrar.profile | 5 | ||||
-rw-r--r-- | etc/profile-m-z/unzip.profile | 5 | ||||
-rw-r--r-- | etc/profile-m-z/xzdec.profile | 1 | ||||
-rw-r--r-- | etc/profile-m-z/zstd.profile | 1 |
11 files changed, 26 insertions, 10 deletions
diff --git a/etc/profile-a-l/7z.profile b/etc/profile-a-l/7z.profile index 76492c339..b2294c070 100644 --- a/etc/profile-a-l/7z.profile +++ b/etc/profile-a-l/7z.profile | |||
@@ -7,5 +7,8 @@ include 7z.local | |||
7 | # Persistent global definitions | 7 | # Persistent global definitions |
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | # Included in archiver-common.inc | ||
10 | ignore include disable-shell.inc | 11 | ignore include disable-shell.inc |
12 | |||
13 | # Redirect | ||
11 | include archiver-common.inc | 14 | include archiver-common.inc |
diff --git a/etc/profile-a-l/ar.profile b/etc/profile-a-l/ar.profile index c2b215807..f99934e66 100644 --- a/etc/profile-a-l/ar.profile +++ b/etc/profile-a-l/ar.profile | |||
@@ -7,4 +7,5 @@ include ar.local | |||
7 | # Persistent global definitions | 7 | # Persistent global definitions |
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | # Redirect | ||
10 | include archiver-common.inc | 11 | include archiver-common.inc |
diff --git a/etc/profile-a-l/atool.profile b/etc/profile-a-l/atool.profile index 34af47df2..6e0ecb012 100644 --- a/etc/profile-a-l/atool.profile +++ b/etc/profile-a-l/atool.profile | |||
@@ -9,10 +9,12 @@ include globals.local | |||
9 | 9 | ||
10 | # Allow perl (blacklisted by disable-interpreters.inc) | 10 | # Allow perl (blacklisted by disable-interpreters.inc) |
11 | include allow-perl.inc | 11 | include allow-perl.inc |
12 | include archiver-common.inc | ||
13 | 12 | ||
14 | noroot | 13 | noroot |
15 | 14 | ||
16 | # without login.defs atool complains and uses UID/GID 1000 by default | 15 | # without login.defs atool complains and uses UID/GID 1000 by default |
17 | private-etc alternatives,group,login.defs,passwd | 16 | private-etc alternatives,group,login.defs,passwd |
18 | private-tmp | 17 | private-tmp |
18 | |||
19 | # Redirect | ||
20 | include archiver-common.inc | ||
diff --git a/etc/profile-a-l/bsdtar.profile b/etc/profile-a-l/bsdtar.profile index c37f4071e..fb4f643c8 100644 --- a/etc/profile-a-l/bsdtar.profile +++ b/etc/profile-a-l/bsdtar.profile | |||
@@ -6,6 +6,7 @@ include bsdtar.local | |||
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include globals.local | 7 | include globals.local |
8 | 8 | ||
9 | include archiver-common.inc | ||
10 | |||
11 | private-etc alternatives,group,localtime,passwd | 9 | private-etc alternatives,group,localtime,passwd |
10 | |||
11 | # Redirect | ||
12 | include archiver-common.inc | ||
diff --git a/etc/profile-a-l/cpio.profile b/etc/profile-a-l/cpio.profile index 785308ffd..0e0299655 100644 --- a/etc/profile-a-l/cpio.profile +++ b/etc/profile-a-l/cpio.profile | |||
@@ -10,4 +10,5 @@ include globals.local | |||
10 | noblacklist /sbin | 10 | noblacklist /sbin |
11 | noblacklist /usr/sbin | 11 | noblacklist /usr/sbin |
12 | 12 | ||
13 | # Redirect | ||
13 | include archiver-common.inc | 14 | include archiver-common.inc |
diff --git a/etc/profile-a-l/gzip.profile b/etc/profile-a-l/gzip.profile index 9b59e57e7..895231aee 100644 --- a/etc/profile-a-l/gzip.profile +++ b/etc/profile-a-l/gzip.profile | |||
@@ -10,4 +10,5 @@ include globals.local | |||
10 | # Arch Linux (based distributions) need access to /var/lib/pacman. As we drop all capabilities this is automatically read-only. | 10 | # Arch Linux (based distributions) need access to /var/lib/pacman. As we drop all capabilities this is automatically read-only. |
11 | noblacklist /var/lib/pacman | 11 | noblacklist /var/lib/pacman |
12 | 12 | ||
13 | # Redirect | ||
13 | include archiver-common.inc | 14 | include archiver-common.inc |
diff --git a/etc/profile-m-z/tar.profile b/etc/profile-m-z/tar.profile index f6efb0feb..1c3612326 100644 --- a/etc/profile-m-z/tar.profile +++ b/etc/profile-m-z/tar.profile | |||
@@ -7,13 +7,16 @@ include tar.local | |||
7 | # Persistent global definitions | 7 | # Persistent global definitions |
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | # Included in archiver-common.inc | ||
11 | ignore include disable-shell.inc | ||
12 | |||
10 | # Arch Linux (based distributions) need access to /var/lib/pacman. As we drop all capabilities this is automatically read-only. | 13 | # Arch Linux (based distributions) need access to /var/lib/pacman. As we drop all capabilities this is automatically read-only. |
11 | noblacklist /var/lib/pacman | 14 | noblacklist /var/lib/pacman |
12 | 15 | ||
13 | ignore include disable-shell.inc | ||
14 | include archiver-common.inc | ||
15 | |||
16 | private-etc alternatives,group,localtime,login.defs,passwd | 16 | private-etc alternatives,group,localtime,login.defs,passwd |
17 | #private-lib libfakeroot,liblzma.so.*,libreadline.so.* | 17 | #private-lib libfakeroot,liblzma.so.*,libreadline.so.* |
18 | # Debian based distributions need this for 'dpkg --unpack' (incl. synaptic) | 18 | # Debian based distributions need this for 'dpkg --unpack' (incl. synaptic) |
19 | writable-var | 19 | writable-var |
20 | |||
21 | # Redirect | ||
22 | include archiver-common.inc | ||
diff --git a/etc/profile-m-z/unrar.profile b/etc/profile-m-z/unrar.profile index 9487f8e68..65f1a425a 100644 --- a/etc/profile-m-z/unrar.profile +++ b/etc/profile-m-z/unrar.profile | |||
@@ -7,8 +7,9 @@ include unrar.local | |||
7 | # Persistent global definitions | 7 | # Persistent global definitions |
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | include archiver-common.inc | ||
11 | |||
12 | private-bin unrar | 10 | private-bin unrar |
13 | private-etc alternatives,group,localtime,passwd | 11 | private-etc alternatives,group,localtime,passwd |
14 | private-tmp | 12 | private-tmp |
13 | |||
14 | # Redirect | ||
15 | include archiver-common.inc | ||
diff --git a/etc/profile-m-z/unzip.profile b/etc/profile-m-z/unzip.profile index 8da9ea820..c94416b87 100644 --- a/etc/profile-m-z/unzip.profile +++ b/etc/profile-m-z/unzip.profile | |||
@@ -10,6 +10,7 @@ include globals.local | |||
10 | # GNOME Shell integration (chrome-gnome-shell) | 10 | # GNOME Shell integration (chrome-gnome-shell) |
11 | noblacklist ${HOME}/.local/share/gnome-shell | 11 | noblacklist ${HOME}/.local/share/gnome-shell |
12 | 12 | ||
13 | include archiver-common.inc | ||
14 | |||
15 | private-etc alternatives,group,localtime,passwd | 13 | private-etc alternatives,group,localtime,passwd |
14 | |||
15 | # Redirect | ||
16 | include archiver-common.inc | ||
diff --git a/etc/profile-m-z/xzdec.profile b/etc/profile-m-z/xzdec.profile index 082392a08..c5e8d1631 100644 --- a/etc/profile-m-z/xzdec.profile +++ b/etc/profile-m-z/xzdec.profile | |||
@@ -7,4 +7,5 @@ include xzdec.local | |||
7 | # Persistent global definitions | 7 | # Persistent global definitions |
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | # Redirect | ||
10 | include archiver-common.inc | 11 | include archiver-common.inc |
diff --git a/etc/profile-m-z/zstd.profile b/etc/profile-m-z/zstd.profile index 42749ba6d..07a75f97f 100644 --- a/etc/profile-m-z/zstd.profile +++ b/etc/profile-m-z/zstd.profile | |||
@@ -7,4 +7,5 @@ include zstd.local | |||
7 | # Persistent global definitions | 7 | # Persistent global definitions |
8 | include globals.local | 8 | include globals.local |
9 | 9 | ||
10 | # Redirect | ||
10 | include archiver-common.inc | 11 | include archiver-common.inc |