[SSI] openssi/openssi-tools/sysadmin Clustertab.pm,1.38,1.38.2.1

Roger Tsang <[email protected]> Sun, 15 Aug 2010 03:06:48 +0000
Newsgroups gmane.linux.cluster.ssic.cvs
Message-ID <[email protected]>
Update of /cvsroot/ssic-linux/openssi/openssi-tools/sysadmin
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12094

Modified Files:
      Tag: OPENSSI-CENTOS
	Clustertab.pm 
Log Message:
util-linux-2.12a-17.el4_6.1 does not support `blkid -o value ...`


Index: Clustertab.pm
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/openssi-tools/sysadmin/Clustertab.pm,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -d -r1.38 -r1.38.2.1
--- Clustertab.pm	23 Jul 2007 10:19:10 -0000	1.38
+++ Clustertab.pm	15 Aug 2010 03:06:46 -0000	1.38.2.1
@@ -124,12 +124,12 @@
 
 	$dev =~ s/^\/dev\/$node\//\/dev\//;
 
-	$dev = `$onnode $node /sbin/blkid -o value -s UUID $dev`;
+	$dev = `$onnode $node /sbin/blkid -s UUID $dev`;
 	chomp $dev;
 
-	return unless length $dev;
+	return unless $dev =~ /UUID=(.+)/;
 
-	return "UUID=\"$dev\"";
+	return "UUID=$1";
 }
 
 sub validate_bootdev {


------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev