You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/05/16 19:20:13 UTC

git commit: updated refs/heads/4.1 to 2fdeee4

Updated Branches:
  refs/heads/4.1 c7ebcb4e8 -> 2fdeee4de


CLOUDSTACK-2492: enable time sync on vmware if ntp is not installed


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2fdeee4d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fdeee4d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fdeee4d

Branch: refs/heads/4.1
Commit: 2fdeee4de7aaca336d68010de9baa731e440cadb
Parents: c7ebcb4
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Wed May 15 15:00:19 2013 -0700
Committer: Chip Childers <ch...@gmail.com>
Committed: Thu May 16 18:18:45 2013 +0100

----------------------------------------------------------------------
 .../debian/config/etc/init.d/cloud-early-config    |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fdeee4d/patches/systemvm/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 676a04a..ee3683f 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -432,6 +432,12 @@ setup_common() {
       ping -n -c 3 $MGMT_GW &
       sleep 3
       pkill ping
+  
+  fi
+
+  local hyp=$(hypervisor)
+  if [ "$hyp" == "vmware" ]; then
+      ntpq -p &> /dev/null || vmware-toolbox-cmd timesync enable
   fi
 }