From edcf95a6f0d1a915c8760fbb0cb876c45713eae9 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Tue, 13 Mar 2012 12:00:14 -0700
Subject: [PATCH] Change KVM's delimiter from "," to "%"

In order not to confuse with commandline parameters
---
 .../agent/resource/computing/LibvirtComputingResource.java      | 2 +-
 scripts/vm/hypervisor/kvm/rundomrpre.sh                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
index 3c31eebd415..c13ce875acd 100755
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
@@ -801,7 +801,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
 		command.add("-l", vmName);
 		command.add("-t", "all");
 		command.add("-d", dataDiskPath);
-		command.add("-p", cmdLine.replaceAll(" ", ","));
+		command.add("-p", cmdLine.replaceAll(" ", "%"));
 		result = command.execute();
 		if (result != null) {
 			throw new InternalErrorException(result);
diff --git a/scripts/vm/hypervisor/kvm/rundomrpre.sh b/scripts/vm/hypervisor/kvm/rundomrpre.sh
index 510b7a65dea..1f089296614 100755
--- a/scripts/vm/hypervisor/kvm/rundomrpre.sh
+++ b/scripts/vm/hypervisor/kvm/rundomrpre.sh
@@ -98,7 +98,7 @@ patch_all() {
         cp $pubKey  $path/authorized_keys
     fi
     echo $cmdline > $path/cmdline 
-    sed -i "s/,/\ /g" $path/cmdline
+    sed -i "s/%/\ /g" $path/cmdline
     return 0
 }