Change in vdsm[master]: fix the premature selinux dependency fix

[Dan Kenigsberg]

Dan Kenigsberg has uploaded a new change for review.

Change subject: fix the premature selinux dependency fix
......................................................................

fix the premature selinux dependency fix

Commit 68d44c613 explaind why fixing the selinux-policy dependency is
important but it actually did not include the semanage code that it has
promised. That's happened, most probably, by a cherry-picking from the
ovirt-3.3 branch.

Change-Id: I627deb840d2351b48c19eb7d17f26f9ba9f54566
Signed-off-by: Dan Kenigsberg 
---
M vdsm.spec.in
1 file changed, 6 insertions(+), 1 deletion(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/84/21284/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index ad4260a..17b77e8 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -161,7 +161,7 @@
 Requires: policycoreutils >= 2.0.83-19.30
 Requires: policycoreutils-python >= 2.0.83-19.30
 Requires: python-pthreading
-Requires: selinux-policy-targeted >= 3.7.19-195.el6.13
+Requires: selinux-policy-targeted >= 3.7.19-155
 Requires: lvm2 >= 2.02.95-10.el6_3.2
 Requires: logrotate < 3.8.0
 %endif
@@ -653,6 +653,11 @@
 if [ "$1" -eq 1 ] ; then
     /sbin/chkconfig --add vdsmd
     /sbin/chkconfig --add supervdsmd
+
+    # drop this ugly hack when selinux-policy-3.7.19-195.el6.13 is released
+    /usr/sbin/semanage fcontext -a -s system_u -t virt_var_run_t -r s0 \
+        '/var/run/vdsm(/.*)?'
+    /sbin/restorecon /var/run/vdsm
 fi
 %else
 %if 0%{?with_systemd}

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: fix the premature selinux dependency fix
......................................................................

Patch Set 1:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4645/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5445/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5524/ : SUCCESS

Eyal Edri has posted comments on this change.

Change subject: fix the premature selinux dependency fix
......................................................................

Patch Set 1:

seems to work, but now fails on another pkg:
---> Package vdsm-xmlrpc.noarch 0:4.13.0-133.git7e51f7b.el6 will be installed
---> Package vdsm-yajsonrpc.noarch 0:4.13.0-133.git7e51f7b.el6 will be installed
--> Finished Dependency Resolution
Error: Package: vdsm-4.13.0-133.git7e51f7b.el6.x86_64 (/vdsm-4.13.0-133.git7e51f7b.el6.x86_64)
           Requires: iscsi-initiator-utils >= 6.2.0.873-3
           Installed: iscsi-initiator-utils-6.2.0.873-2.el6.x86_64 (@anaconda-CentOS-201303020151.x86_64/6.4)
               iscsi-initiator-utils = 6.2.0.873-2.el6

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: fix the premature selinux dependency fix
......................................................................

Patch Set 1:

I don't think it is related - can you check with the parent commit?

Yaniv Bronhaim has posted comments on this change.

Change subject: fix the premature selinux dependency fix
......................................................................

Patch Set 1: Code-Review+1

Change in vdsm[master]: fix selinux dependency

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: fix selinux dependency
......................................................................

Patch Set 2:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4964/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5764/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5854/ : SUCCESS

Change in vdsm[master]: fix selinux dependency

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: fix selinux dependency
......................................................................

Patch Set 2: Verified+1 Code-Review+1

Affecting: http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/label=cen...

Change in vdsm[master]: fix selinux dependency

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: fix selinux dependency
......................................................................

Patch Set 2: Code-Review+1

Change in vdsm[master]: fix selinux dependency

Yaniv Bronhaim has posted comments on this change.

Change subject: fix selinux dependency
......................................................................

Patch Set 2: Code-Review+1

Change in vdsm[master]: fix selinux dependency

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: fix selinux dependency
......................................................................

Patch Set 2: Code-Review+2

Change in vdsm[master]: fix selinux dependency

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: fix selinux dependency
......................................................................

fix selinux dependency

Fix a typo in the release field, introduced by commit 68d44c613.

Change-Id: I627deb840d2351b48c19eb7d17f26f9ba9f54566
Signed-off-by: Dan Kenigsberg 
Reviewed-on: http://gerrit.ovirt.org/21284
Reviewed-by: Douglas Schilling Landgraf 
Tested-by: Douglas Schilling Landgraf 
Reviewed-by: Nir Soffer 
Reviewed-by: Yaniv Bronhaim 
---
M vdsm.spec.in
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, but someone else must approve
  Nir Soffer: Looks good to me, but someone else must approve
  Yaniv Bronhaim: Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved