[node-patches] Change in ovirt-node[ovirt-3.5]: hooks: Drop runcon

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: hooks: Drop runcon
......................................................................

hooks: Drop runcon

runcon seems to introduce regressions on el7, thus dropping it.

Change-Id: I7141c3f2772f7d5bd43829d58121ee4bc128dc43
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/ovirt-node-hooks.sh
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/32/48732/1

diff --git a/scripts/ovirt-node-hooks.sh b/scripts/ovirt-node-hooks.sh
index 21c7f01..ef73dca 100644
--- a/scripts/ovirt-node-hooks.sh
+++ b/scripts/ovirt-node-hooks.sh
@@ -36,7 +36,12 @@
             for handler in "$HOOK_DIR/$1"/*;
             do
                 echo "Running handler: $handler"
-                runcon -t unconfined_t "$handler" >> $OVIRT_HOOKLOG 2>&1
+		if grep -s ":7:" /etc/system-release-cpe; then
+                    "$handler" >> $OVIRT_HOOKLOG 2>&1
+                else
+                    # On el6 we need to use runcon for correct SELinux ctx transitions
+                    runcon -t unconfined_t "$handler" >> $OVIRT_HOOKLOG 2>&1
+                fi
             done
         fi
 


-- 
To view, visit https://gerrit.ovirt.org/48732
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7141c3f2772f7d5bd43829d58121ee4bc128dc43
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>