diff options
| author |   Chris PeBenito <pebenito@gentoo.org> | 2006-05-16 02:01:02 +0000 |
|---|---|---|
| committer | Chris PeBenito <pebenito@gentoo.org> | 2006-05-16 02:01:02 +0000 |
| commit | 9cea76bf656b49d1ecce5b26804d4a4b660ed00d (patch) | |
| tree | 090e8c1d55409b51e512381a6d520760cb63ea13 /eclass/selinux-policy.eclass | |
| parent | - fix false textrel markings for x86 libs. bug 88363 (diff) | |
| download | historical-9cea76bf656b49d1ecce5b26804d4a4b660ed00d.tar.gz historical-9cea76bf656b49d1ecce5b26804d4a4b660ed00d.tar.bz2 historical-9cea76bf656b49d1ecce5b26804d4a4b660ed00d.zip | |
move vars out of global scope, bug 123963
Diffstat (limited to 'eclass/selinux-policy.eclass')
| -rw-r--r-- | eclass/selinux-policy.eclass | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/eclass/selinux-policy.eclass b/eclass/selinux-policy.eclass index c495be320b50..86f90dfad36f 100644 --- a/eclass/selinux-policy.eclass +++ b/eclass/selinux-policy.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v 1.15 2005/07/06 20:23:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v 1.16 2006/05/16 02:01:02 pebenito Exp $ # Eclass for installing SELinux policy, and optionally # reloading the policy @@ -18,20 +18,19 @@ IUSE="" RDEPEND=">=sec-policy/selinux-base-policy-20030729" -[ -z "${POLICYDIR}" ] && POLICYDIR="/etc/security/selinux/src/policy" - -SAVENAME="`date +%Y%m%d%H%M`-${PN}.tar.bz2" -SAVEDIR="`echo "${POLICYDIR}" | cut -d/ -f6`" - selinux-policy_src_compile() { cd ${S} + [ -z "${POLICYDIR}" ] && POLICYDIR="/etc/security/selinux/src/policy" + SAVENAME="`date +%Y%m%d%H%M`-${PN}.tar.bz2" + SAVEDIR="`echo "${POLICYDIR}" | cut -d/ -f6`" + einfo "Backup of policy source is \"${SAVENAME}\"." debug-print "POLICYDIR is \"${POLICYDIR}\"" debug-print "SAVEDIR is \"${SAVEDIR}\"" # create a backup of the current policy - tar -C /etc/security/selinux/src --exclude policy.12 --exclude tmp \ + tar -C /etc/security/selinux/src --exclude tmp \ --exclude policy.conf -jcf ${SAVENAME} ${SAVEDIR}/ } @@ -39,7 +38,7 @@ selinux-policy_src_install() { cd ${S} insinto /etc/security/selinux/src/policy-backup - doins ${SAVENAME} + doins *-${PN}.tar.bz2 if [ -n "${TEFILES}" ]; then debug-print "TEFILES is \"${TEFILES}\"" |