Hello Douglas Schilling Landgraf, Federico Simoncelli,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/11363
to review the following change.
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 <[email protected]>
Reviewed-on: http://gerrit.ovirt.org/9840
Reviewed-by: Douglas Schilling Landgraf <[email protected]>
Reviewed-by: Dan Kenigsberg <[email protected]>
---
M vdsm.spec.in
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/11363/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 5b13419..e153880 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -131,6 +131,12 @@
Requires: lvm2 >= 2.02.95
%endif
+# 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.
+%if 0%{?fedora} >= 18
+Requires: policycoreutils >= 2.1.13-44
+%endif
+
Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client
Requires: psmisc >= 22.6-15
Requires: fence-agents
@@ -479,7 +485,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
@@ -521,7 +527,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@ovirt
--
To view, visit http://gerrit.ovirt.org/11363
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefd5f53c9118eeea6817ce9660ea18abcfd1955c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.2
Gerrit-Owner: Dan Kenigsberg <[email protected]>
Gerrit-Reviewer: Douglas Schilling Landgraf <[email protected]>
Gerrit-Reviewer: Federico Simoncelli <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
