aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar glitsj16 <glitsj16@users.noreply.github.com>2021-03-02 17:26:39 +0000
committerLibravatar GitHub <noreply@github.com>2021-03-02 17:26:39 +0000
commit809ff0364f87faff2b8b6b2bc3a157bd7a56f767 (patch)
treecafae8bd516844f92b99aaa406128b0e1d705403
parentFix typos (diff)
parentrename archiver-common.inc (diff)
downloadfirejail-809ff0364f87faff2b8b6b2bc3a157bd7a56f767.tar.gz
firejail-809ff0364f87faff2b8b6b2bc3a157bd7a56f767.tar.zst
firejail-809ff0364f87faff2b8b6b2bc3a157bd7a56f767.zip
Merge pull request #4028 from glitsj16/archiver-common
Rename archiver-common.inc
-rw-r--r--etc/profile-a-l/7z.profile4
-rw-r--r--etc/profile-a-l/ar.profile2
-rw-r--r--etc/profile-a-l/archiver-common.profile (renamed from etc/inc/archiver-common.inc)0
-rw-r--r--etc/profile-a-l/atool.profile2
-rw-r--r--etc/profile-a-l/bsdtar.profile2
-rw-r--r--etc/profile-a-l/cpio.profile2
-rw-r--r--etc/profile-a-l/gzip.profile2
-rw-r--r--etc/profile-m-z/tar.profile4
-rw-r--r--etc/profile-m-z/unrar.profile2
-rw-r--r--etc/profile-m-z/unzip.profile2
-rw-r--r--etc/profile-m-z/xzdec.profile2
-rw-r--r--etc/profile-m-z/zstd.profile2
12 files changed, 13 insertions, 13 deletions
diff --git a/etc/profile-a-l/7z.profile b/etc/profile-a-l/7z.profile
index b2294c070..0d31255ad 100644
--- a/etc/profile-a-l/7z.profile
+++ b/etc/profile-a-l/7z.profile
@@ -7,8 +7,8 @@ include 7z.local
7# Persistent global definitions 7# Persistent global definitions
8include globals.local 8include globals.local
9 9
10# Included in archiver-common.inc 10# Included in archiver-common.profile
11ignore include disable-shell.inc 11ignore include disable-shell.inc
12 12
13# Redirect 13# Redirect
14include archiver-common.inc 14include archiver-common.profile
diff --git a/etc/profile-a-l/ar.profile b/etc/profile-a-l/ar.profile
index f99934e66..5a20a8181 100644
--- a/etc/profile-a-l/ar.profile
+++ b/etc/profile-a-l/ar.profile
@@ -8,4 +8,4 @@ include ar.local
8include globals.local 8include globals.local
9 9
10# Redirect 10# Redirect
11include archiver-common.inc 11include archiver-common.profile
diff --git a/etc/inc/archiver-common.inc b/etc/profile-a-l/archiver-common.profile
index 74b0b6ef6..74b0b6ef6 100644
--- a/etc/inc/archiver-common.inc
+++ b/etc/profile-a-l/archiver-common.profile
diff --git a/etc/profile-a-l/atool.profile b/etc/profile-a-l/atool.profile
index 6e0ecb012..e377de2c8 100644
--- a/etc/profile-a-l/atool.profile
+++ b/etc/profile-a-l/atool.profile
@@ -17,4 +17,4 @@ private-etc alternatives,group,login.defs,passwd
17private-tmp 17private-tmp
18 18
19# Redirect 19# Redirect
20include archiver-common.inc 20include archiver-common.profile
diff --git a/etc/profile-a-l/bsdtar.profile b/etc/profile-a-l/bsdtar.profile
index fb4f643c8..d731a6a6e 100644
--- a/etc/profile-a-l/bsdtar.profile
+++ b/etc/profile-a-l/bsdtar.profile
@@ -9,4 +9,4 @@ include globals.local
9private-etc alternatives,group,localtime,passwd 9private-etc alternatives,group,localtime,passwd
10 10
11# Redirect 11# Redirect
12include archiver-common.inc 12include archiver-common.profile
diff --git a/etc/profile-a-l/cpio.profile b/etc/profile-a-l/cpio.profile
index 0e0299655..bdc4f21a6 100644
--- a/etc/profile-a-l/cpio.profile
+++ b/etc/profile-a-l/cpio.profile
@@ -11,4 +11,4 @@ noblacklist /sbin
11noblacklist /usr/sbin 11noblacklist /usr/sbin
12 12
13# Redirect 13# Redirect
14include archiver-common.inc 14include archiver-common.profile
diff --git a/etc/profile-a-l/gzip.profile b/etc/profile-a-l/gzip.profile
index 035c6459c..b261c16f4 100644
--- a/etc/profile-a-l/gzip.profile
+++ b/etc/profile-a-l/gzip.profile
@@ -12,4 +12,4 @@ include globals.local
12noblacklist /var/lib/pacman 12noblacklist /var/lib/pacman
13 13
14# Redirect 14# Redirect
15include archiver-common.inc 15include archiver-common.profile
diff --git a/etc/profile-m-z/tar.profile b/etc/profile-m-z/tar.profile
index 9d7a23d43..0d3a900e9 100644
--- a/etc/profile-m-z/tar.profile
+++ b/etc/profile-m-z/tar.profile
@@ -7,7 +7,7 @@ include tar.local
7# Persistent global definitions 7# Persistent global definitions
8include globals.local 8include globals.local
9 9
10# Included in archiver-common.inc 10# Included in archiver-common.profile
11ignore include disable-shell.inc 11ignore include disable-shell.inc
12 12
13# Arch Linux (based distributions) need access to /var/lib/pacman. As we drop 13# Arch Linux (based distributions) need access to /var/lib/pacman. As we drop
@@ -20,4 +20,4 @@ private-etc alternatives,group,localtime,login.defs,passwd
20writable-var 20writable-var
21 21
22# Redirect 22# Redirect
23include archiver-common.inc 23include archiver-common.profile
diff --git a/etc/profile-m-z/unrar.profile b/etc/profile-m-z/unrar.profile
index 65f1a425a..9d3d9b40e 100644
--- a/etc/profile-m-z/unrar.profile
+++ b/etc/profile-m-z/unrar.profile
@@ -12,4 +12,4 @@ private-etc alternatives,group,localtime,passwd
12private-tmp 12private-tmp
13 13
14# Redirect 14# Redirect
15include archiver-common.inc 15include archiver-common.profile
diff --git a/etc/profile-m-z/unzip.profile b/etc/profile-m-z/unzip.profile
index c94416b87..0231e3dba 100644
--- a/etc/profile-m-z/unzip.profile
+++ b/etc/profile-m-z/unzip.profile
@@ -13,4 +13,4 @@ noblacklist ${HOME}/.local/share/gnome-shell
13private-etc alternatives,group,localtime,passwd 13private-etc alternatives,group,localtime,passwd
14 14
15# Redirect 15# Redirect
16include archiver-common.inc 16include archiver-common.profile
diff --git a/etc/profile-m-z/xzdec.profile b/etc/profile-m-z/xzdec.profile
index c5e8d1631..79f71f2fd 100644
--- a/etc/profile-m-z/xzdec.profile
+++ b/etc/profile-m-z/xzdec.profile
@@ -8,4 +8,4 @@ include xzdec.local
8include globals.local 8include globals.local
9 9
10# Redirect 10# Redirect
11include archiver-common.inc 11include archiver-common.profile
diff --git a/etc/profile-m-z/zstd.profile b/etc/profile-m-z/zstd.profile
index 07a75f97f..faeb5c5c5 100644
--- a/etc/profile-m-z/zstd.profile
+++ b/etc/profile-m-z/zstd.profile
@@ -8,4 +8,4 @@ include zstd.local
8include globals.local 8include globals.local
9 9
10# Redirect 10# Redirect
11include archiver-common.inc 11include archiver-common.profile