aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-09-03 22:23:29 +0100
committerAnthony G. Basile <blueness@gentoo.org>2015-09-03 18:48:58 -0400
commit0c769ad9174df3da0bec260f675d64c5b40d7061 (patch)
tree7f8bd208543e159e9d1d3c16a0405f14a1fd1ffc /scripts
parentmisc/install-xattr: update ChangeLog (diff)
downloadelfix-0c769ad9174df3da0bec260f675d64c5b40d7061.tar.gz
elfix-0c769ad9174df3da0bec260f675d64c5b40d7061.tar.bz2
elfix-0c769ad9174df3da0bec260f675d64c5b40d7061.zip
scripts/paxmark.sh: make.conf can be a directory
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/paxmark.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/paxmark.sh b/scripts/paxmark.sh
index 408e6aa..9d151f0 100755
--- a/scripts/paxmark.sh
+++ b/scripts/paxmark.sh
@@ -87,6 +87,14 @@ paxmarksh() {
}
MAKE_CONF="/etc/portage/make.conf"
-[[ -e $MAKE_CONF ]] && source $MAKE_CONF
+
+if [[ -d $MAKE_CONF ]]; then
+ for MC in $MAKE_CONF/*; do
+ source $MC
+ done
+elif [[ -e $MAKE_CONF ]]; then
+ source $MAKE_CONF
+fi
+
PAX_MARKINGS=${PAX_MARKINGS:="PT"}
paxmarksh "$@"