Cluster Project branch, RHEL5, updated. cmirror_1_1_15-115-gce02cca

Cluster Project branch, RHEL5, updated. cmirror_1_1_15-115-gce02cca

[lhh]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=ce02ccaa6fdbb1192c5e9714c06347f7f37bf0de

The branch, RHEL5 has been updated
       via  ce02ccaa6fdbb1192c5e9714c06347f7f37bf0de (commit)
      from  6f5127de838baf655212e2122b44823fc75da452 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ce02ccaa6fdbb1192c5e9714c06347f7f37bf0de
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Thu Jun 12 09:36:16 2008 +0200

    [QDISK] Add better support for Xen virtual block devices
    
    This change allows to detect Xen virtual disks directly
    into sysfsattrs.disk without the need of an external filter.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 cman/qdisk/scandisk.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/cman/qdisk/scandisk.c b/cman/qdisk/scandisk.c
index 77484f6..ee7ce7f 100644
--- a/cman/qdisk/scandisk.c
+++ b/cman/qdisk/scandisk.c
@@ -590,7 +590,17 @@ static int sysfs_is_disk(char *path)
 
 	snprintf(newpath, sizeof(newpath), "%s/../device/media", path);
 	if (lstat(newpath, &sb))
-		return -1;
+		goto found;
+
+	snprintf(newpath, sizeof(newpath), "%s/device/devtype", path);
+	if (lstat(newpath, &sb))
+		return 1;
+
+	snprintf(newpath, sizeof(newpath), "%s/../device/devtype", path);
+	if (lstat(newpath, &sb))
+		return 1;
+
+	return -1;
 
       found:
 	f = fopen(newpath, "r");


hooks/post-receive
--
Cluster Project