selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 3 ++-
selinux/oracle-selinux/oracle-selinux.spec | 11 +++++++----
selinux/oracle-xe-selinux/oracle-xe-selinux-enable | 5 +++--
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 3 ++-
4 files changed, 14 insertions(+), 8 deletions(-)
New commits:
commit 46b9cd79e9de090d291f64afe0993dfbfe63aaf3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 29 14:53:21 2010 +0100
Do semodule -l before any semodule operation.
This allows us to drop the > /dev/null on the actual operation
and thus see any errors that might otherwise go lost.
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
index 239054c..f9bc69e 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
@@ -97,7 +97,8 @@ if [ $1 -eq 0 ]; then
# Remove SELinux policy modules
for selinuxvariant in %{selinux_variants}
do
- /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
+ /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
+ && /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} || :
done
# Clean up oracle-server-arch files
diff --git a/selinux/oracle-selinux/oracle-selinux.spec
b/selinux/oracle-selinux/oracle-selinux.spec
index c80748a..87b1b37 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -121,8 +121,9 @@ rm -rf %{buildroot}
# Install SELinux policy modules
for selinuxvariant in %{selinux_variants}
do
- /usr/sbin/semodule -s ${selinuxvariant} -i \
- %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || :
+ /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
+ && /usr/sbin/semodule -s ${selinuxvariant} -i \
+ %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp || :
done
# add an oracle port if it does not already exist
@@ -167,7 +168,8 @@ if [ $1 -eq 0 ]; then
# Remove SELinux policy modules
for selinuxvariant in %{selinux_variants}
do
- /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
+ /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
+ && /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} || :
done
# Clean up any remaining file contexts (shouldn't be any really)
[ -d %{oracle_base} ] && \
@@ -187,7 +189,8 @@ if [ $1 -eq 0 ]; then
# Remove SELinux policy modules
for selinuxvariant in %{selinux_variants}
do
- /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename}-nofcontext &>
/dev/null || :
+ /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
+ && /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename}-nofcontext ||
:
done
fi
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux-enable
b/selinux/oracle-xe-selinux/oracle-xe-selinux-enable
index e2abdf7..18508b1 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux-enable
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux-enable
@@ -3,8 +3,9 @@
# Install SELinux policy modules
for selinuxvariant in mls strict targeted
do
- /usr/sbin/semodule -s ${selinuxvariant} -i \
- /usr/share/selinux/${selinuxvariant}/oracle-xe.pp &> /dev/null || :
+ /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
+ && /usr/sbin/semodule -s ${selinuxvariant} -i \
+ /usr/share/selinux/${selinuxvariant}/oracle-xe.pp || :
done
/usr/sbin/semanage port -a -t oracle_port_t -p tcp 9055 || :
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index 003d3ed..14ce013 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -117,7 +117,8 @@ if [ $1 -eq 0 ]; then
# Remove SELinux policy modules
for selinuxvariant in %{selinux_variants}
do
- /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
+ /usr/sbin/semodule -s ${selinuxvariant} -l > /dev/null 2>&1 \
+ && /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} || :
done
/usr/sbin/semanage port -d -t oracle_port_t -p tcp 9000 || :
Show replies by date