commit: 5d97f52774e256b670a95f42583e01a9c268b7e6 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Wed Dec 23 02:39:38 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Dec 23 02:39:38 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d97f527
pax-utils.eclass: silence excessive output from paxctl{,-ng}, scanelf and setfattr eclass/pax-utils.eclass | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass index a99bd78..9ed1170 100644 --- a/eclass/pax-utils.eclass +++ b/eclass/pax-utils.eclass @@ -78,30 +78,30 @@ pax-mark() { for f in "$@"; do # First try paxctl -> this might try to create/convert program headers. - if type -p paxctl > /dev/null; then + if type -p paxctl >/dev/null; then einfo "PT_PAX marking -${flags} ${f} with paxctl" # First, try modifying the existing PAX_FLAGS header. - paxctl -q${flags} "${f}" && continue + paxctl -q${flags} "${f}" >/dev/null 2>&1 && continue # Second, try creating a PT_PAX header (works on ET_EXEC). # Even though this is less safe, most exes need it. #463170 - paxctl -qC${flags} "${f}" && continue + paxctl -qC${flags} "${f}" >/dev/null 2>&1 && continue # Third, try stealing the (unused under PaX) PT_GNU_STACK header - paxctl -qc${flags} "${f}" && continue + paxctl -qc${flags} "${f}" >/dev/null 2>&1 && continue fi # Next try paxctl-ng -> this will not create/convert any program headers. - if type -p paxctl-ng > /dev/null && paxctl-ng -L ; then + if type -p paxctl-ng >/dev/null && paxctl-ng -L ; then einfo "PT_PAX marking -${flags} ${f} with paxctl-ng" flags="${flags//z}" - [[ ${dodefault} == "yes" ]] && paxctl-ng -L -z "${f}" + [[ ${dodefault} == "yes" ]] && paxctl-ng -L -z "${f}" >/dev/null 2>&1 [[ "${flags}" ]] || continue - paxctl-ng -L -${flags} "${f}" && continue + paxctl-ng -L -${flags} "${f}" >/dev/null 2>&1 && continue fi # Finally fall back on scanelf. - if type -p scanelf > /dev/null && [[ ${PAX_MARKINGS} != "none" ]]; then + if type -p scanelf >/dev/null && [[ ${PAX_MARKINGS} != "none" ]]; then einfo "PT_PAX marking -${flags} ${f} with scanelf" - scanelf -Xxz ${flags} "$f" + 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}." @@ -117,19 +117,19 @@ pax-mark() { for f in "$@"; do # First try paxctl-ng. - if type -p paxctl-ng > /dev/null && paxctl-ng -l ; then + if type -p paxctl-ng >/dev/null && paxctl-ng -l ; then einfo "XATTR_PAX marking -${flags} ${f} with paxctl-ng" - [[ ${dodefault} == "yes" ]] && paxctl-ng -d "${f}" + [[ ${dodefault} == "yes" ]] && paxctl-ng -d "${f}" >/dev/null 2>&1 [[ "${flags}" ]] || continue - paxctl-ng -l -${flags} "${f}" && continue + paxctl-ng -l -${flags} "${f}" >/dev/null 2>&1 && continue fi # Next try setfattr. - if type -p setfattr > /dev/null; then + if type -p setfattr >/dev/null; then [[ "${flags//[!Ee]}" ]] || flags+="e" # bug 447150 einfo "XATTR_PAX marking -${flags} ${f} with setfattr" - [[ ${dodefault} == "yes" ]] && setfattr -x "user.pax.flags" "${f}" - setfattr -n "user.pax.flags" -v "${flags}" "${f}" && continue + [[ ${dodefault} == "yes" ]] && setfattr -x "user.pax.flags" "${f}" >/dev/null 2>&1 + setfattr -n "user.pax.flags" -v "${flags}" "${f}" >/dev/null 2>&1 && continue fi # We failed to set XATTR_PAX flags.