Skip to content

Commit

Permalink
archivers: move archiver-common.inc include to the bottom
Browse files Browse the repository at this point in the history
And mark it as a redirect profile.

This is done so when including other *-common.inc profiles, such as
firefox-common.profile.
  • Loading branch information
kmk3 authored and rusty-snake committed Feb 8, 2021
1 parent 703f160 commit c2e40c6
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 10 deletions.
3 changes: 3 additions & 0 deletions etc/profile-a-l/7z.profile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@ include 7z.local
# Persistent global definitions
include globals.local

# Included in archiver-common.inc
ignore include disable-shell.inc

# Redirect
include archiver-common.inc
1 change: 1 addition & 0 deletions etc/profile-a-l/ar.profile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ include ar.local
# Persistent global definitions
include globals.local

# Redirect
include archiver-common.inc
4 changes: 3 additions & 1 deletion etc/profile-a-l/atool.profile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ include globals.local

# Allow perl (blacklisted by disable-interpreters.inc)
include allow-perl.inc
include archiver-common.inc

noroot

# without login.defs atool complains and uses UID/GID 1000 by default
private-etc alternatives,group,login.defs,passwd
private-tmp

# Redirect
include archiver-common.inc
5 changes: 3 additions & 2 deletions etc/profile-a-l/bsdtar.profile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ include bsdtar.local
# Persistent global definitions
include globals.local

include archiver-common.inc

private-etc alternatives,group,localtime,passwd

# Redirect
include archiver-common.inc
1 change: 1 addition & 0 deletions etc/profile-a-l/cpio.profile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ include globals.local
noblacklist /sbin
noblacklist /usr/sbin

# Redirect
include archiver-common.inc
1 change: 1 addition & 0 deletions etc/profile-a-l/gzip.profile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ include globals.local
# Arch Linux (based distributions) need access to /var/lib/pacman. As we drop all capabilities this is automatically read-only.
noblacklist /var/lib/pacman

# Redirect
include archiver-common.inc
9 changes: 6 additions & 3 deletions etc/profile-m-z/tar.profile
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ include tar.local
# Persistent global definitions
include globals.local

# Included in archiver-common.inc
ignore include disable-shell.inc

# Arch Linux (based distributions) need access to /var/lib/pacman. As we drop all capabilities this is automatically read-only.
noblacklist /var/lib/pacman

ignore include disable-shell.inc
include archiver-common.inc

private-etc alternatives,group,localtime,login.defs,passwd
#private-lib libfakeroot,liblzma.so.*,libreadline.so.*
# Debian based distributions need this for 'dpkg --unpack' (incl. synaptic)
writable-var

# Redirect
include archiver-common.inc
5 changes: 3 additions & 2 deletions etc/profile-m-z/unrar.profile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ include unrar.local
# Persistent global definitions
include globals.local

include archiver-common.inc

private-bin unrar
private-etc alternatives,group,localtime,passwd
private-tmp

# Redirect
include archiver-common.inc
5 changes: 3 additions & 2 deletions etc/profile-m-z/unzip.profile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ include globals.local
# GNOME Shell integration (chrome-gnome-shell)
noblacklist ${HOME}/.local/share/gnome-shell

include archiver-common.inc

private-etc alternatives,group,localtime,passwd

# Redirect
include archiver-common.inc
1 change: 1 addition & 0 deletions etc/profile-m-z/xzdec.profile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ include xzdec.local
# Persistent global definitions
include globals.local

# Redirect
include archiver-common.inc
1 change: 1 addition & 0 deletions etc/profile-m-z/zstd.profile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ include zstd.local
# Persistent global definitions
include globals.local

# Redirect
include archiver-common.inc

0 comments on commit c2e40c6

Please sign in to comment.