diff options
author | startx2017 <vradu.startx@yandex.com> | 2019-05-29 09:48:20 -0400 |
---|---|---|
committer | startx2017 <vradu.startx@yandex.com> | 2019-05-29 09:48:20 -0400 |
commit | d8bc228b658a82c71bf79fdf3855bd8d5280acfc (patch) | |
tree | 74e6b8b13d210436d933e4172e041bca5192fc2b | |
parent | merge: fix --list reporting for sandboxes using --x11=none (diff) | |
download | firejail-d8bc228b658a82c71bf79fdf3855bd8d5280acfc.tar.gz firejail-d8bc228b658a82c71bf79fdf3855bd8d5280acfc.tar.zst firejail-d8bc228b658a82c71bf79fdf3855bd8d5280acfc.zip |
merge: Avoid including globals.local twice
-rw-r--r-- | etc/acat.profile | 3 | ||||
-rw-r--r-- | etc/adiff.profile | 3 | ||||
-rw-r--r-- | etc/als.profile | 3 | ||||
-rw-r--r-- | etc/apack.profile | 3 | ||||
-rw-r--r-- | etc/arepack.profile | 3 | ||||
-rw-r--r-- | etc/aunpack.profile | 3 | ||||
-rw-r--r-- | etc/bunzip2.profile | 3 | ||||
-rw-r--r-- | etc/gunzip.profile | 3 | ||||
-rw-r--r-- | status | 3 |
9 files changed, 17 insertions, 10 deletions
diff --git a/etc/acat.profile b/etc/acat.profile index 08593585c..23d09cb46 100644 --- a/etc/acat.profile +++ b/etc/acat.profile | |||
@@ -3,7 +3,8 @@ | |||
3 | # Persistent local customizations | 3 | # Persistent local customizations |
4 | include /etc/firejail/acat.local | 4 | include /etc/firejail/acat.local |
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | # added by included profile |
7 | #include /etc/firejail/globals.local | ||
7 | 8 | ||
8 | # Redirect | 9 | # Redirect |
9 | include /etc/firejail/atool.profile | 10 | include /etc/firejail/atool.profile |
diff --git a/etc/adiff.profile b/etc/adiff.profile index 2c114d765..f13482719 100644 --- a/etc/adiff.profile +++ b/etc/adiff.profile | |||
@@ -3,7 +3,8 @@ | |||
3 | # Persistent local customizations | 3 | # Persistent local customizations |
4 | include /etc/firejail/adiff.local | 4 | include /etc/firejail/adiff.local |
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | # added by included profile |
7 | #include /etc/firejail/globals.local | ||
7 | 8 | ||
8 | # Redirect | 9 | # Redirect |
9 | include /etc/firejail/atool.profile | 10 | include /etc/firejail/atool.profile |
diff --git a/etc/als.profile b/etc/als.profile index 8cd9a9182..b2d80803c 100644 --- a/etc/als.profile +++ b/etc/als.profile | |||
@@ -3,7 +3,8 @@ | |||
3 | # Persistent local customizations | 3 | # Persistent local customizations |
4 | include /etc/firejail/als.local | 4 | include /etc/firejail/als.local |
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | # added by included profile |
7 | #include /etc/firejail/globals.local | ||
7 | 8 | ||
8 | # Redirect | 9 | # Redirect |
9 | include /etc/firejail/atool.profile | 10 | include /etc/firejail/atool.profile |
diff --git a/etc/apack.profile b/etc/apack.profile index ad44b227e..e0f360745 100644 --- a/etc/apack.profile +++ b/etc/apack.profile | |||
@@ -3,7 +3,8 @@ | |||
3 | # Persistent local customizations | 3 | # Persistent local customizations |
4 | include /etc/firejail/apack.local | 4 | include /etc/firejail/apack.local |
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | # added by included profile |
7 | #include /etc/firejail/globals.local | ||
7 | 8 | ||
8 | # Redirect | 9 | # Redirect |
9 | include /etc/firejail/atool.profile | 10 | include /etc/firejail/atool.profile |
diff --git a/etc/arepack.profile b/etc/arepack.profile index f7a9f724a..926a6f53d 100644 --- a/etc/arepack.profile +++ b/etc/arepack.profile | |||
@@ -3,7 +3,8 @@ | |||
3 | # Persistent local customizations | 3 | # Persistent local customizations |
4 | include /etc/firejail/arepack.local | 4 | include /etc/firejail/arepack.local |
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | # added by included profile |
7 | #include /etc/firejail/globals.local | ||
7 | 8 | ||
8 | # Redirect | 9 | # Redirect |
9 | include /etc/firejail/atool.profile | 10 | include /etc/firejail/atool.profile |
diff --git a/etc/aunpack.profile b/etc/aunpack.profile index 4f03ac60d..793dd0977 100644 --- a/etc/aunpack.profile +++ b/etc/aunpack.profile | |||
@@ -3,7 +3,8 @@ | |||
3 | # Persistent local customizations | 3 | # Persistent local customizations |
4 | include /etc/firejail/aunpack.local | 4 | include /etc/firejail/aunpack.local |
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | # added by included profile |
7 | #include /etc/firejail/globals.local | ||
7 | 8 | ||
8 | # Redirect | 9 | # Redirect |
9 | include /etc/firejail/atool.profile | 10 | include /etc/firejail/atool.profile |
diff --git a/etc/bunzip2.profile b/etc/bunzip2.profile index f483a1d3d..951a53935 100644 --- a/etc/bunzip2.profile +++ b/etc/bunzip2.profile | |||
@@ -3,7 +3,8 @@ | |||
3 | # Persistent local customizations | 3 | # Persistent local customizations |
4 | include /etc/firejail/bunzip2.local | 4 | include /etc/firejail/bunzip2.local |
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | # added by included profile |
7 | #include /etc/firejail/globals.local | ||
7 | 8 | ||
8 | # Redirect | 9 | # Redirect |
9 | include /etc/firejail/gzip.profile | 10 | include /etc/firejail/gzip.profile |
diff --git a/etc/gunzip.profile b/etc/gunzip.profile index 8ea523df7..c3e2f11e0 100644 --- a/etc/gunzip.profile +++ b/etc/gunzip.profile | |||
@@ -3,7 +3,8 @@ | |||
3 | # Persistent local customizations | 3 | # Persistent local customizations |
4 | include /etc/firejail/gunzip.local | 4 | include /etc/firejail/gunzip.local |
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | # added by included profile |
7 | #include /etc/firejail/globals.local | ||
7 | 8 | ||
8 | # Redirect | 9 | # Redirect |
9 | include /etc/firejail/gzip.profile | 10 | include /etc/firejail/gzip.profile |
@@ -3,8 +3,7 @@ todo: Dec 17: join: also check proc file to detect nonewprivs bit | |||
3 | todo: Sort items alphabetically in man firejail #2479, Feb 26 | 3 | todo: Sort items alphabetically in man firejail #2479, Feb 26 |
4 | todo: Alphabetical ordering of firecfg.config #2544, Mar 8 | 4 | todo: Alphabetical ordering of firecfg.config #2544, Mar 8 |
5 | todo: Fix incorrect parsing of --keep-var-tmp command #2587 | 5 | todo: Fix incorrect parsing of --keep-var-tmp command #2587 |
6 | todo: Avoid including globals.local twice, #2586 | 6 | Mar 13: Avoid including globals.local twice, #2586 |
7 | todo: Fix typo's in firecfg util.c #2627 | ||
8 | Mar 10: fix --list reporting for sandboxes using --x11=none; to be ported Mar 10 | 7 | Mar 10: fix --list reporting for sandboxes using --x11=none; to be ported Mar 10 |
9 | Mar 10: checking for invalid chars in profile filename before any other proce… | 8 | Mar 10: checking for invalid chars in profile filename before any other proce… |
10 | todo: documentation update - Feb 23 | 9 | todo: documentation update - Feb 23 |