From 23d85f042be5e9d5bdd0e25a679f0257a256d46b Mon Sep 17 00:00:00 2001
From: edison <edison@cloud.com>
Date: Tue, 23 Nov 2010 19:12:29 -0800
Subject: [PATCH] when re-seed systemvm template, we just need to specify
 hypervisor type, no need to the wired number

---
 scripts/storage/secondary/installrtng.sh | 34 +++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/scripts/storage/secondary/installrtng.sh b/scripts/storage/secondary/installrtng.sh
index e78d2b31ff0..b566ba3c774 100755
--- a/scripts/storage/secondary/installrtng.sh
+++ b/scripts/storage/secondary/installrtng.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 # $Id: installrtng.sh 11251 2010-07-23 23:40:44Z abhishek $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/scripts/storage/secondary/installrtng.sh $
 usage() {
-  printf "Usage: %s: -m <secondary storage mount point> -f <system vm template file> [-F] [-t <template id>] [-e <template extention name>]\n" $(basename $0) >&2
+  printf "Usage: %s: -m <secondary storage mount point> -f <system vm template file> [-h <hypervisor name: kvm|vmware|xen>]\n" $(basename $0) >&2
   printf "or\n" >&2
-  printf "%s: -m <secondary storage mount point> -u <http url for system vm template> [-F] [-t <template id>] [-e <template extention name>]\n" $(basename $0) >&2
+  printf "%s: -m <secondary storage mount point> -u <http url for system vm template> [-h <hypervisor name: kvm|vmware|xen>]\n" $(basename $0) >&2
 }
 
 mflag=
 fflag=
 ext="vhd"
 templateId=1
-while getopts 'm:f:u:Ft:e:' OPTION
+hyper=
+while getopts 'm:h:f:u:Ft:e:' OPTION
 do
   case $OPTION in
   m)	mflag=1
@@ -27,6 +28,8 @@ do
   		;;
   e)    ext="$OPTARG"
   		;;
+  h)    hyper="$OPTARG"
+  		;;
   ?)	usage
 		exit 2
 		;;
@@ -39,12 +42,37 @@ then
   exit 2
 fi
 
+if [ -z "$hyper" ]
+then
+  usage
+  exit 2
+fi
+
 if [[ "$fflag" == "1" && ! -f $tmpltimg ]] 
 then
   echo "template image file $tmpltimg doesn't exist"
   exit 3
 fi
 
+if [ "$hyper" == "kvm" ]
+then
+   ext="qcow2"
+   templateId=3
+elif [ "$hyper" == "xen" ]
+then
+   ext="vhd"
+   templateId=1
+elif [ "hyper" == "vmware" ]
+then
+   ext="ova"
+   templateId=8
+else
+   usage
+   exit 2
+fi
+   
+
+
 localfile=$(uuidgen).$ext
 
 if [ ! -d $mntpoint ]