Change in vdsm[master]: Packaging: libvirt configuration detection should skip /dev/...

Zhou Zheng Sheng has uploaded a new change for review.

Change subject: Packaging: libvirt configuration detection should skip /dev/null
......................................................................

Packaging: libvirt configuration detection should skip /dev/null

We disabled libvirt-sanlock in Ubuntu, so QLCONF is set to /dev/null,
and later we need to grep "${BY_VDSM_VERS}" from QLCONF to confirm
libvirt is configured. grep returns 1 for /dev/null but actually libvirt
is configured. This patch skip /dev/null when grep libvirt .conf files.

Change-Id: Ia0d8a976c023709068ca2f3691fab5cd59ae02ff
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;
---
M lib/vdsm/tool/libvirt_configure.sh.in
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/60/20260/1

diff --git a/lib/vdsm/tool/libvirt_configure.sh.in
b/lib/vdsm/tool/libvirt_configure.sh.in
index ed8a466..f9ac757 100755
--- a/lib/vdsm/tool/libvirt_configure.sh.in
+++ b/lib/vdsm/tool/libvirt_configure.sh.in
@@ -152,6 +152,10 @@
 is_already_configured() {
     local rc=0
     while [ -n "$1" ]; do
+        if [ "$1" = "/dev/null" ];then
+            shift
+            continue
+        fi
         if ! /bin/grep -q "${BY_VDSM_VERS}" "$1" >/dev/null
2>&1; then
             rc=1
             echo "libvirt is not configured for vdsm yet"


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0d8a976c023709068ca2f3691fab5cd59ae02ff
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Packaging: libvirt configuration detection should skip /dev/null
......................................................................


Patch Set 1:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5033/ : ABORTED

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4146/ : FAILURE

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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia0d8a976c023709068ca2f3691fab5cd59ae02ff
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: Packaging: libvirt configuration detection should skip /dev/null
......................................................................


Packaging: libvirt configuration detection should skip /dev/null

We disabled libvirt-sanlock in Ubuntu, so QLCONF is set to /dev/null,
and later we need to grep "${BY_VDSM_VERS}" from QLCONF to confirm
libvirt is configured. grep returns 1 for /dev/null but actually libvirt
is configured. This patch skip /dev/null when grep libvirt .conf files.

Change-Id: Ia0d8a976c023709068ca2f3691fab5cd59ae02ff
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;
Reviewed-on: http://gerrit.ovirt.org/20260
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M lib/vdsm/tool/libvirt_configure.sh.in
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Dan Kenigsberg: Looks good to me, approved
  Zhou Zheng Sheng: Verified



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0d8a976c023709068ca2f3691fab5cd59ae02ff
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Packaging: libvirt configuration detection should skip /dev/null
......................................................................


Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia0d8a976c023709068ca2f3691fab5cd59ae02ff
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;
Gerrit-HasComments: No

Zhou Zheng Sheng has posted comments on this change.

Change subject: Packaging: libvirt configuration detection should skip /dev/null
......................................................................


Patch Set 1: Verified+1

Tested on Ubuntu.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia0d8a976c023709068ca2f3691fab5cd59ae02ff
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;
Gerrit-HasComments: No