Change in vdsm[master]: spec: require policycoreutils and skip sebool errors

fsimonce at redhat.com fsimonce at redhat.com
Tue Dec 11 11:05:04 UTC 2012


Federico Simoncelli has uploaded a new change for review.

Change subject: spec: require policycoreutils and skip sebool errors
......................................................................

spec: require policycoreutils and skip sebool errors

In order to avoid a policycoreutils bug (rhbz 883355) when selinux is
disabled we now require the version 2.1.13-44 (or newer) of Fedora.
Additionally we now skip any error in the rpm scriptlets for the sebool
configuration (sebool-config) since they could interfere with the rpm
installation potentially leaving multiple packages installed.

Change-Id: Iefd5f53c9118eeea6817ce9660ea18abcfd1955c
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
---
M vdsm.spec.in
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/9840/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 9830afe..34b8eb8 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -123,6 +123,7 @@
 Requires: sanlock >= 2.4-2, sanlock-python
 Requires: sed >= 4.2.1-10
 Requires: selinux-policy-targeted >= 3.10.0-149
+Requires: policycoreutils >= 2.1.13-44
 Requires: lvm2 >= 2.02.95
 %endif
 
@@ -475,7 +476,7 @@
 /usr/sbin/usermod -a -G %{qemu_group},%{vdsm_group} %{snlk_user}
 
 %post
-%{_bindir}/vdsm-tool sebool-config
+%{_bindir}/vdsm-tool sebool-config || :
 # set the vdsm "secret" password for libvirt
 %{_bindir}/vdsm-tool set-saslpasswd
 
@@ -517,7 +518,7 @@
     /bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \
         /etc/sysctl.conf
 
-    %{_bindir}/vdsm-tool sebool-unconfig
+    %{_bindir}/vdsm-tool sebool-unconfig || :
 
     /usr/sbin/saslpasswd2 -p -a libvirt -d vdsm at ovirt
 


--
To view, visit http://gerrit.ovirt.org/9840
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefd5f53c9118eeea6817ce9660ea18abcfd1955c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce at redhat.com>


More information about the vdsm-patches mailing list