From 9246f5fa22f5b9ea9cf9d70e2218b7e6b6b060f2 Mon Sep 17 00:00:00 2001
From: datajerk <datajerk@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 14 May 2009 06:35:00 +0000
Subject: [PATCH] Updated exit code in autogpfsc.pl to be more unique.

Fixed but in autogpfsc BLOCK=yes code.


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3375 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc    | 3 ++-
 xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc
index 24676e34c..648dd577c 100755
--- a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc
+++ b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc
@@ -53,10 +53,11 @@ case "$1" in
 
 			for i in $(
 				grep "\bgpfs\b" /etc/fstab | \
+				grep -v noauto | \
 				awk '{print $2}'
 			)
 			do
-				mount | grep "\b/gpfs1\b" >/dev/null 2>&1
+				mount | grep "\b/$1\b" >/dev/null 2>&1
 				if [ "$?" != "0" ]
 				then
 					DOBLOCK=yes
diff --git a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl
index 3827ec207..d98426425 100755
--- a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl
+++ b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc.pl
@@ -28,7 +28,7 @@ while(<$sock>) {
 	$line = $_;
 
 	if($line =~ /^busy/) {
-		exit(2);
+		exit(3);
 	}
 	if($line =~ /^new started/) {
 		next;