[node-patches] Change in ovirt-node[ovirt-3.5]: functions: Fix persistence check

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: functions: Fix persistence check
......................................................................

functions: Fix persistence check

Previously a check to test the persistence of a file was broken and
always returned False. This lead to a situation where a files was registered
to be persisted more than once.
This could then lead - with a previously fixed bug - to the situation
where a file was bind mounted several times into place.

Change-Id: Ia8ef8bfb396761fcfbab366858a14865b9a75943
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1246117
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirtnode/ovirtfunctions.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/08/44208/1

diff --git a/src/ovirtnode/ovirtfunctions.py b/src/ovirtnode/ovirtfunctions.py
index c881d07..9f0efb3 100644
--- a/src/ovirtnode/ovirtfunctions.py
+++ b/src/ovirtnode/ovirtfunctions.py
@@ -837,7 +837,7 @@
                         logger.info("File: " + filename + " persisted")
                         rc = rc and True
             # register in /config/files used by rc.sysinit
-            ret = system_closefds("grep -q \"^$" + filename +"$\" " + \
+            ret = system_closefds("grep -q \"^" + filename +"$\" " + \
                                   " /config/files 2> /dev/null")
             if ret > 0:
                 system_closefds("echo "+filename+" >> /config/files")


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

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