diff options
| author |   Chris PeBenito <pebenito@gentoo.org> | 2003-11-24 06:12:04 +0000 |
|---|---|---|
| committer | Chris PeBenito <pebenito@gentoo.org> | 2003-11-24 06:12:04 +0000 |
| commit | 6c81992589a4e17cd8f0363db365bf05803e26bf (patch) | |
| tree | b1ad2235291dbbd000c9693db85015aa5b963cb9 /sys-apps/policycoreutils | |
| parent | bump to use selinux-init (diff) | |
| download | gentoo-2-6c81992589a4e17cd8f0363db365bf05803e26bf.tar.gz gentoo-2-6c81992589a4e17cd8f0363db365bf05803e26bf.tar.bz2 gentoo-2-6c81992589a4e17cd8f0363db365bf05803e26bf.zip | |
add header, and fix error handling
Diffstat (limited to 'sys-apps/policycoreutils')
| -rw-r--r-- | sys-apps/policycoreutils/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/policycoreutils/files/selinux-init | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest index b07cd3d61d57..a152f6080aa0 100644 --- a/sys-apps/policycoreutils/Manifest +++ b/sys-apps/policycoreutils/Manifest @@ -1,7 +1,7 @@ MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836 MD5 2e7ba9acdb4ea7bea59c58f85ee855d4 ChangeLog 2372 MD5 0cbdf93b9f7f7649427e0b7e8c696370 policycoreutils-1.2-r2.ebuild 1442 -MD5 15675ff6205f7c37131a3e181589db47 files/selinux-init 671 +MD5 b3e5bece06545088b90e09a70b01aa42 files/selinux-init 916 MD5 1f231a1da642997577ac4567ee9867ac files/rlpkg 2317 MD5 7821fa9efa9de78861110c8bd21bf714 files/newrole 326 MD5 7821fa9efa9de78861110c8bd21bf714 files/run_init 326 diff --git a/sys-apps/policycoreutils/files/selinux-init b/sys-apps/policycoreutils/files/selinux-init index f7541565e8eb..67cff1d3e02e 100644 --- a/sys-apps/policycoreutils/files/selinux-init +++ b/sys-apps/policycoreutils/files/selinux-init @@ -1,4 +1,7 @@ #!/bin/bash +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/files/selinux-init,v 1.2 2003/11/24 06:12:02 pebenito Exp $ mount -n -t proc none /proc @@ -20,9 +23,11 @@ if [ -n ${ENABLED} ]; then POLICYVER=15 # load the policy if it exists - [ -f /etc/security/selinux/policy.${POLICYVER} ] && \ - /usr/sbin/load_policy /etc/security/selinux/policy.${POLICYVER} || \ + if [ -f /etc/security/selinux/policy.${POLICYVER} ]; then + /usr/sbin/load_policy /etc/security/selinux/policy.${POLICYVER} + else echo "Unable to load policy: /etc/security/selinux/policy.${POLICYVER} missing." + fi fi exec /sbin/init |