From 342ac47dd34c6e43546b1ef59007760cbbf99015 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 9 Dec 2008 16:26:40 +0000
Subject: [PATCH] -Accomodate disparate AMMs a bit more readily in rvid
 -Accomodate a few more AMM firmware revisions

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2535 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/share/xcat/rvid/rvid.blade |  3 ++-
 xCAT-server/lib/xcat/plugins/blade.pm  | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/xCAT-client/share/xcat/rvid/rvid.blade b/xCAT-client/share/xcat/rvid/rvid.blade
index f7ea692e4..1c2773c6d 100755
--- a/xCAT-client/share/xcat/rvid/rvid.blade
+++ b/xCAT-client/share/xcat/rvid/rvid.blade
@@ -1,8 +1,9 @@
 #!/bin/sh
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
+mkdir -p /tmp/xcat
 if [ ! -f /tmp/xcat/$rvid_server.remotekvm.jar ]; then 
     wget -O /tmp/xcat/$rvid_server.remotekvm.jar http://$rvid_server/private/remotekvm.jar
 fi
 
-java -jar /tmp/remotekvm.jar -s $rvid_server -r $rvid_authtoken -b $rvid_slot >& /dev/null
+java -jar /tmp/xcat/$rvid_server.remotekvm.jar -s $rvid_server -r $rvid_authtoken -b $rvid_slot >& /dev/null
 rm /tmp/xcat/rvid_server.remotekvm.jar
diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index aa7ddf2fc..ed441edd0 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -1792,6 +1792,20 @@ sub get_kvm_params {
            }
         }
     }
+    unless (defined $destip and defined $rbs) { #Try another way
+        $response = $browser->get("http://$mpa/private/remotecontrol.js.php");
+        foreach (split /\n/,$html) {
+            if (/<param\s+name\s*=\s*"([^"]*)"\s+value\s*=\s*"([^"]*)"/i) {
+               if ($1 eq 'ip') {
+                   $destip=$2;
+               } elsif ($1 eq 'rbs') {
+                    $rbs = $2;
+               }
+            }
+        }
+    }
+
+
     return ($destip,$rbs);
 }