Updated Branches: refs/heads/ui-restyle 326b3a607 -> 849d601cc
CLOUDSTACK-5821 systemvmiso is locked by systevmvm in hyperv Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ac48934 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ac48934 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ac48934 Branch: refs/heads/ui-restyle Commit: 7ac48934f77c3b9a72c05300163088a4c198ebf2 Parents: 807dc09 Author: Rajesh Battala <rajesh.batt...@citrix.com> Authored: Tue Jan 28 06:42:54 2014 +0530 Committer: Rajesh Battala <rajesh.batt...@citrix.com> Committed: Tue Jan 28 07:03:08 2014 +0530 ---------------------------------------------------------------------- systemvm/patches/debian/config/etc/init.d/cloud-early-config | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ac48934/systemvm/patches/debian/config/etc/init.d/cloud-early-config ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config index d6dc8f0..df80a28 100755 --- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config +++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config @@ -135,7 +135,7 @@ get_boot_params() { virtualpc|hyperv) # Hyper-V is recognized as virtualpc hypervisor type. Boot args are passed using KVP Daemon #waiting for the hv_kvp_daemon to start up - #sleep 30 need to fix the race condition of hv_kvp_daemon and cloud-early-config + #sleep need to fix the race condition of hv_kvp_daemon and cloud-early-config sleep 5 cp -f /var/opt/hyperv/.kvp_pool_0 /var/cache/cloud/cmdline cat /dev/null > /var/opt/hyperv/.kvp_pool_0 @@ -1211,6 +1211,10 @@ start() { patch_log4j parse_cmd_line change_password + if [ "$hyp" == "hyperv" ]; then + # eject the systemvm.iso + eject + fi case $TYPE in router) [ "$NAME" == "" ] && NAME=router
