[node-patches] Change in ovirt-node[master]: Properly find the LOGGING mount in the installer

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Properly find the LOGGING mount in the installer
......................................................................

Properly find the LOGGING mount in the installer

Don't look for writable when we look for the logging mount, and
don't chcon the entire thing (only the actual mount is needed)

Change-Id: Id69c7193205b707339646eba065156e2a3b4003a
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M src/ovirtnode/ovirtfunctions.py
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/13/31113/1

diff --git a/src/ovirtnode/ovirtfunctions.py b/src/ovirtnode/ovirtfunctions.py
index 65dcb21..c854b4c 100644
--- a/src/ovirtnode/ovirtfunctions.py
+++ b/src/ovirtnode/ovirtfunctions.py
@@ -1177,12 +1177,12 @@
 
     # fix SELinux
     logging_dev = findfs("LOGGING")
-    logging_mount_cmd = ("grep %s /proc/mounts | grep writable |" +
-                         "awk '{print $2}'") % logging_dev
+    logging_mount_cmd = ("grep %s /proc/mounts | awk '{print $2}'") % \
+                         logging_dev
     logging_mount = subprocess_closefds(logging_mount_cmd, shell=True,
                                         stdout=PIPE, stderr=STDOUT)
     (logging_mount_output, dummy) = logging_mount.communicate()
-    system("chcon -R system_u:object_r:var_log_t:s0 %s" % logging_mount_output)
+    system("chcon system_u:object_r:var_log_t:s0 %s" % logging_mount_output)
     system("chcon -R system_u:object_r:auditd_log_t:s0 %s/audit/" %
            logging_mount_output.rstrip())
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id69c7193205b707339646eba065156e2a3b4003a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>