You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/05/25 00:31:51 UTC
git commit: updated refs/heads/master to 9dcfbce
Repository: cloudstack
Updated Branches:
refs/heads/master 87d4086a6 -> 9dcfbceae
kvm: for disabling pxe, pass empty file
Passing the file argument to the xml break for EL 7.1, the fix removes
the argument as just passing rombar='off' with its file arg to be empty string.
This closes #290
(cherry picked from commit aafa0c80b35a9f0e533e5a4b18d03f1e47cf9bfe)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9dcfbcea
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9dcfbcea
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9dcfbcea
Branch: refs/heads/master
Commit: 9dcfbceae71865b4de1a4744ceac8f48255733a2
Parents: 87d4086
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri May 22 15:03:35 2015 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon May 25 00:31:32 2015 +0200
----------------------------------------------------------------------
.../kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dcfbcea/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 25ad8e9..c4c4b02 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -982,7 +982,7 @@ public class LibvirtVMDef {
netBuilder.append("<script path='" + _scriptPath + "'/>\n");
}
if (_pxeDisable) {
- netBuilder.append("<rom bar='off' file='dummy'/>");
+ netBuilder.append("<rom bar='off' file=''/>");
}
if (_virtualPortType != null) {
netBuilder.append("<virtualport type='" + _virtualPortType + "'>\n");