From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 6 Sep 2006 15:34:03 -0000
Subject: [Cluster-devel] cluster/fence/agents/drac fence_drac.pl
Message-ID: <20060906153403.30344.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	jparsons at sourceware.org	2006-09-06 15:34:03

Modified files:
	fence/agents/drac: fence_drac.pl 

Log message:
	Support for DRAC ERA

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/drac/fence_drac.pl.diff?cvsroot=cluster&r1=1.7&r2=1.8

--- cluster/fence/agents/drac/fence_drac.pl	2006/08/16 19:16:01	1.7
+++ cluster/fence/agents/drac/fence_drac.pl	2006/09/06 15:34:03	1.8
@@ -17,6 +17,8 @@
 #  Model 		DRAC Version	Firmware
 #  -------------------	--------------	----------------------
 #  PowerEdge 750	DRAC III/XT	3.20 (Build 10.25)
+#  Dell Remote Access Controller - ERA and DRAC III/XT, v.3.20, A00
+#  
 #  PowerEdge 1855	DRAC/MC		1.1  (Build 03.03)
 #  PowerEdge 1855	DRAC/MC		1.2  (Build 03.03)
 #  PowerEdge 1850	DRAC 4/I	1.35 (Build 09.27)
@@ -130,6 +132,10 @@
 		fail "failed: telnet failed: ". $t->errmsg."\n" ;
 
 	# Determine DRAC version
+  if (/Dell Embedded Remote Access Controller \(ERA\)\nFirmware Version/m)
+  {
+    $drac_version = $DRAC_VERSION_III_XT;
+  } else {
 	if (/.*\((DRAC[^)]*)\)/m)
 	{
 		print "detected drac version '$1'\n" if $verbose;
@@ -144,6 +150,7 @@
 		print "WARNING: unable to detect DRAC version '$_'\n";
 		$drac_version = $DRAC_VERSION_UNKNOWN;
 	}
+  }
 
 	# Setup prompt
 	if ($drac_version =~ /$DRAC_VERSION_III_XT/)
@@ -508,7 +515,11 @@
 		{
 			$cmd_prompt = $val;
 		} 
-		# Excess name/vals won't fail
+		# Excess name/vals will fail
+		else 
+		{
+			fail "parse error: unknown option \"$opt\"";
+		}
 	}
 }