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 2014/11/26 19:37:18 UTC
[06/12] git commit: updated refs/heads/4.3 to 8de4894
CLOUDSTACK-5821 systemvmiso is locked by systevmvm in hyperv
(cherry picked from commit 7ac48934f77c3b9a72c05300163088a4c198ebf2)
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/36224710
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36224710
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36224710
Branch: refs/heads/4.3
Commit: 3622471099294dce91dd6dce5d096fa791ddf9ef
Parents: 4d24452
Author: Rajesh Battala <ra...@citrix.com>
Authored: Tue Jan 28 06:42:54 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Nov 26 22:15:35 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/36224710/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 8cc927f..a34db68 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
@@ -1250,6 +1250,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