diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-12-21 10:37:00 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-12-21 10:37:00 -0500 |
| commit | 84ca11706f804d6c808d932700a90cc8eaab2f15 (patch) | |
| tree | dfde48524b75e00391628f843c06e6c540b08a3a /scripts | |
| parent | ChangeLog: updated (diff) | |
| download | elfix-84ca11706f804d6c808d932700a90cc8eaab2f15.tar.gz elfix-84ca11706f804d6c808d932700a90cc8eaab2f15.tar.bz2 elfix-84ca11706f804d6c808d932700a90cc8eaab2f15.zip | |
scripts/paxmark.sh: source make.conf and properly set PAX_MARKINGS
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/paxmark.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/paxmark.sh b/scripts/paxmark.sh index 9ec077a..408e6aa 100755 --- a/scripts/paxmark.sh +++ b/scripts/paxmark.sh @@ -53,7 +53,6 @@ paxmarksh() { scanelf -Xxz ${flags} "$f" >/dev/null 2>&1 #We failed to set PT_PAX flags elif [[ ${PAX_MARKINGS} != "none" ]]; then - elog "Failed to set PT_PAX markings -${flags} ${f}." ret=1 fi done @@ -79,7 +78,6 @@ paxmarksh() { #We failed to set XATTR_PAX flags if [[ ${PAX_MARKINGS} != "none" ]]; then - elog "Failed to set XATTR_PAX markings -${flags} ${f}." ret=1 fi done @@ -88,5 +86,7 @@ paxmarksh() { return ${ret} } -PAX_MARKINGS=${PAX_MARKINGS:="PT XT"} +MAKE_CONF="/etc/portage/make.conf" +[[ -e $MAKE_CONF ]] && source $MAKE_CONF +PAX_MARKINGS=${PAX_MARKINGS:="PT"} paxmarksh "$@" |