etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 14215: Fix SSVM on Xen kernel panic due to "too many env var" 

Just add different delimitor for VM and extract them from cmdline later.

status 14215: resolved fixed
This commit is contained in:
Sheng Yang 2012-03-16 14:43:45 -07:00
parent f21263364f
commit e8c27c1978
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -860,7 +860,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
String bootArgs = vmSpec.getBootArgs();
if (bootArgs != null && bootArgs.length() > 0) {
String pvargs = vm.getPVArgs(conn);
pvargs = pvargs + vmSpec.getBootArgs();
pvargs = pvargs + vmSpec.getBootArgs().replaceAll(" ", "%");
if (s_logger.isDebugEnabled()) {
s_logger.debug("PV args are " + pvargs);
}

2
core/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
View File

@ -180,7 +180,7 @@ public class XenServer56FP1Resource extends XenServer56Resource {
String bootArgs = vmSpec.getBootArgs();
if (bootArgs != null && bootArgs.length() > 0) {
String pvargs = vm.getPVArgs(conn);
pvargs = pvargs + vmSpec.getBootArgs();
pvargs = pvargs + vmSpec.getBootArgs().replaceAll(" ", "%");
if (s_logger.isDebugEnabled()) {
s_logger.debug("PV args are " + pvargs);
}

1
patches/systemvm/debian/config/etc/init.d/cloud-early-config
View File

@ -89,6 +89,7 @@ get_boot_params() {
case $hyp in
xen-domU)
cat /proc/cmdline > /var/cache/cloud/cmdline
sed -i "s/%/ /g" /var/cache/cloud/cmdline
;;
kvm)
# KVM needs to mount another disk, to get cmdline