From 9b3ad00b78dab7065bfeca2c50ef8f1447fecc21 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 21 Jul 2010 13:44:03 +0200
Subject: [PATCH 092/133] selinux: fixed error handling for load-policy
{} | cmd opens a subshell for {}
---
modules.d/98selinux/selinux-loadpolicy.sh | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/modules.d/98selinux/selinux-loadpolicy.sh b/modules.d/98selinux/selinux-loadpolicy.sh
index 7db9f8c..9959993 100755
--- a/modules.d/98selinux/selinux-loadpolicy.sh
+++ b/modules.d/98selinux/selinux-loadpolicy.sh
@@ -18,19 +18,20 @@ rd_load_policy()
# Attempt to load SELinux Policy
if [ -x "$NEWROOT/usr/sbin/load_policy" -o -x "$NEWROOT/sbin/load_policy" ]; then
- ret=0
+ local ret=0
+ local out
info "Loading SELinux policy"
- {
- # load_policy does mount /proc and /selinux in
- # libselinux,selinux_init_load_policy()
- if [ -x "$NEWROOT/sbin/load_policy" ]; then
- chroot "$NEWROOT" /sbin/load_policy -i
- ret=$?
- else
- chroot "$NEWROOT" /usr/sbin/load_policy -i
- ret=$?
- fi
- } 2>&1 | vinfo
+ # load_policy does mount /proc and /selinux in
+ # libselinux,selinux_init_load_policy()
+ if [ -x "$NEWROOT/sbin/load_policy" ]; then
+ out=$(chroot "$NEWROOT" /sbin/load_policy -i 2>&1)
+ ret=$?
+ info $out
+ else
+ out=$(chroot "$NEWROOT" /usr/sbin/load_policy -i 2>&1)
+ ret=$?
+ info $out
+ fi
if [ "$SELINUX" = "disabled" ]; then
return 0;
--
1.7.3