From 804c125ad007f8f8758401655b67a99c4364a602 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 13 Jan 2012 17:30:05 +0000
Subject: [PATCH] Fix S3 support of IBM systems

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11379 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/ipmi.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index ade6c4092..4408b7c21 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -479,6 +479,10 @@ sub on_bmc_connect {
 		return;
 	}
 	if ($command eq "rpower") {
+        	unless (defined $sessdata->{device_id}) { #need get device id data initted for S3 support
+	            $sessdata->{ipmisession}->subcmd(netfn=>6,command=>1,data=>[],callback=>\&gotdevid,callback_args=>$sessdata);
+		    return;
+	        }
 		return power($sessdata);
 	} elsif ($command eq "rspreset") {
         return resetbmc($sessdata);
@@ -1156,7 +1160,7 @@ sub power {
 	my $text;
 	my $code;
         if (not $sessdata->{acpistate} and $sessdata->{mfg_id} == 20301) { #Only implemented for IBM servers
-		$sessdata->{ipmisession}->subcmd(netfn=>0x3a,command=>0x1d,data=>[],callback=>\&power_with_acpi,callback_args=>$sessdata);
+		$sessdata->{ipmisession}->subcmd(netfn=>0x3a,command=>0x1d,data=>[1],callback=>\&power_with_acpi,callback_args=>$sessdata);
 	} else {
 		$sessdata->{ipmisession}->subcmd(netfn=>0,command=>1,data=>[],callback=>\&power_with_context,callback_args=>$sessdata);
 	}