[vdsm/f17] update to vdsm-4.10.0-12

[Federico Simoncelli]

commit 85755664917e2a410341c7aa395c70c25e11e7b2
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Sat Oct 27 03:38:46 2012 +0200

    update to vdsm-4.10.0-12
    
    - configure selinux for sanlock on nfs
    
    Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>

 ...etup-configure-selinux-for-sanlock-on-nfs.patch |   59 ++++++++++++++++++++
 vdsm.spec                                          |   15 ++++-
 2 files changed, 72 insertions(+), 2 deletions(-)
---
diff --git a/0045-setup-configure-selinux-for-sanlock-on-nfs.patch b/0045-setup-configure-selinux-for-sanlock-on-nfs.patch
new file mode 100644
index 0000000..346a824
--- /dev/null
+++ b/0045-setup-configure-selinux-for-sanlock-on-nfs.patch
@@ -0,0 +1,59 @@
+From 59722223c4d241a47ba8b4cf9f5281996b2db374 Mon Sep 17 00:00:00 2001
+From: Federico Simoncelli <fsimonce at redhat.com>
+Date: Thu, 27 Sep 2012 08:31:08 -0400
+Subject: [PATCH] setup: configure selinux for sanlock on nfs
+
+Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
+Change-Id: Id9005d23d009c65770b7836feb81ab97206e9a8a
+Reviewed-on: http://gerrit.ovirt.org/8255
+Reviewed-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-by: Ayal Baron <abaron at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/8755
+---
+ vdsm.spec.in | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/vdsm.spec.in b/vdsm.spec.in
+index 6be7da4..5f5f989 100644
+--- a/vdsm.spec.in
++++ b/vdsm.spec.in
+@@ -380,17 +380,21 @@ rm -rf %{buildroot}
+ # The next lines will collect the default selinux behaviour for the booleans
+ virtNFS=$(/usr/sbin/semanage boolean -l | /bin/grep virt_use_nfs | cut -d ',' -f 2)
+ virtSANLOCK=$(/usr/sbin/semanage boolean -l | /bin/grep virt_use_sanlock | cut -d ',' -f 2)
++snlkNFS=$(/usr/sbin/semanage boolean -l | /bin/grep sanlock_use_nfs | cut -d ',' -f 2)
+ 
+-if [[ "${virtNFS}" == *off* || "${virtSANLOCK}" == *off* ]]; then
++if [[ "${virtNFS}" == *off* || "${virtSANLOCK}" == *off* || \
++      "${snlkNFS}" == *off* ]]; then
+     /usr/sbin/semanage boolean -m -S targeted -F /dev/stdin  << _EOF
+ virt_use_nfs=1
+ virt_use_sanlock=1
++sanlock_use_nfs=1
+ _EOF
+ fi
+ 
+ if /usr/sbin/selinuxenabled; then
+     /usr/sbin/setsebool virt_use_nfs on
+     /usr/sbin/setsebool virt_use_sanlock on
++    /usr/sbin/setsebool sanlock_use_nfs on
+ fi
+ 
+ %post
+@@ -434,11 +438,13 @@ then
+     /usr/sbin/semanage boolean -m -S targeted -F /dev/stdin  << _EOF
+ virt_use_nfs=0
+ virt_use_sanlock=0
++sanlock_use_nfs=0
+ _EOF
+ 
+     if /usr/sbin/selinuxenabled; then
+         /usr/sbin/setsebool virt_use_nfs off
+         /usr/sbin/setsebool virt_use_sanlock off
++        /usr/sbin/setsebool sanlock_use_nfs off
+     fi
+ 
+     /usr/sbin/saslpasswd2 -p -a libvirt -d vdsm at rhevh
+-- 
+1.7.11.7
+
diff --git a/vdsm.spec b/vdsm.spec
index 2793579..4a38fa4 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -28,7 +28,7 @@
 
 Name:           %{vdsm_name}
 Version:        4.10.0
-Release:        11%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Release:        12%{?vdsm_relvtag}%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -87,6 +87,7 @@ Patch40: 0041-BZ-842948-deployUtil-safely-remove-bridge.patch
 Patch41: 0042-Ship-the-version-file-with-the-tarballs.patch
 Patch42: 0043-Use-the-recommended-alignment-instead-of-using-pages.patch
 Patch43: 0044-Use-buffer-size-in-multiplies-of-the-recommended-tra.patch
+Patch44: 0045-setup-configure-selinux-for-sanlock-on-nfs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -434,6 +435,7 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 %{__chmod} +x build-aux/pkg-version  # required by patch41
 %patch42 -p1 -b .patch42
 %patch43 -p1 -b .patch43
+%patch44 -p1 -b .patch44
 
 %build
 %if 0%{?enable_autotools}
@@ -506,17 +508,21 @@ rm -rf %{buildroot}
 # The next lines will collect the default selinux behaviour for the booleans
 virtNFS=$(/usr/sbin/semanage boolean -l | /bin/grep virt_use_nfs | cut -d ',' -f 2)
 virtSANLOCK=$(/usr/sbin/semanage boolean -l | /bin/grep virt_use_sanlock | cut -d ',' -f 2)
+snlkNFS=$(/usr/sbin/semanage boolean -l | /bin/grep sanlock_use_nfs | cut -d ',' -f 2)
 
-if [[ "${virtNFS}" == *off* || "${virtSANLOCK}" == *off* ]]; then
+if [[ "${virtNFS}" == *off* || "${virtSANLOCK}" == *off* || \
+      "${snlkNFS}" == *off* ]]; then
     /usr/sbin/semanage boolean -m -S targeted -F /dev/stdin  << _EOF
 virt_use_nfs=1
 virt_use_sanlock=1
+sanlock_use_nfs=1
 _EOF
 fi
 
 if /usr/sbin/selinuxenabled; then
     /usr/sbin/setsebool virt_use_nfs on
     /usr/sbin/setsebool virt_use_sanlock on
+    /usr/sbin/setsebool sanlock_use_nfs on
 fi
 
 %post
@@ -560,11 +566,13 @@ then
     /usr/sbin/semanage boolean -m -S targeted -F /dev/stdin  << _EOF
 virt_use_nfs=0
 virt_use_sanlock=0
+sanlock_use_nfs=0
 _EOF
 
     if /usr/sbin/selinuxenabled; then
         /usr/sbin/setsebool virt_use_nfs off
         /usr/sbin/setsebool virt_use_sanlock off
+        /usr/sbin/setsebool sanlock_use_nfs off
     fi
 
     /usr/sbin/saslpasswd2 -p -a libvirt -d vdsm at rhevh
@@ -998,6 +1006,9 @@ exit 0
 %{_datadir}/%{vdsm_name}/gluster/hostname.py*
 
 %changelog
+* Wed Oct 24 2012 Federico Simoncelli <fsimonce at redhat.com> 4.10.0-12
+- configure selinux for sanlock on nfs
+
 * Sat Oct 20 2012 Peter Robinson <pbrobinson at fedoraproject.org> 4.10.0-11
 - Merge F17 changes into F18+ and disable make check due to pep8 issues
 - Add pyparted dependency