cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajeshbatt...@apache.org
Subject [2/2] git commit: updated refs/heads/hyperv to 16422cb
Date Fri, 11 Oct 2013 11:16:21 GMT
modifified cloud-early-config to configure, when the VR boots up in HyperV Environment


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

Branch: refs/heads/hyperv
Commit: 33e19bf1875b3a01d4ef3b790a92a152da1773f4
Parents: f1c2c50
Author: Rajesh Battala <rajesh.battala@citrix.com>
Authored: Fri Oct 11 12:13:41 2013 +0530
Committer: Rajesh Battala <rajesh.battala@citrix.com>
Committed: Fri Oct 11 16:43:32 2013 +0530

----------------------------------------------------------------------
 .../debian/config/etc/init.d/cloud-early-config    | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33e19bf1/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 88ecc11..1cc399f 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -130,12 +130,11 @@ get_boot_params() {
      vmware)
           vmtoolsd --cmd 'machine.id.get' > /var/cache/cloud/cmdline 
           ;;
-     virtualpc)
-          # Hyper-V is recognized as virtualpc hypervisor type. Boot args are passed in the
NTFS data-disk
-          mkdir -p $EXTRA_MOUNT
-          mount -t ntfs /dev/sdb1 $EXTRA_MOUNT
-          cp -f $EXTRA_MOUNT/cmdline /var/cache/cloud/cmdline
-          umount $EXTRA_MOUNT
+     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
+          cp -f /var/opt/hyperv/.kvp_pool_0 /var/cache/cloud/cmdline
           ;;
   esac
 
@@ -157,6 +156,10 @@ patch() {
        cdrom_dev=/dev/cdrom
   elif [ -e /dev/cdrom1 ]; then
        cdrom_dev=/dev/cdrom1
+  elif [ -e /dev/cdrom2 ]; then
+       cdrom_dev=/dev/cdrom2
+  elif [ -e /dev/cdrom3 ]; then
+       cdrom_dev=/dev/cdrom3
   fi
   [ -f /var/cache/cloud/authorized_keys ] && privkey=/var/cache/cloud/authorized_keys
 
@@ -718,7 +721,7 @@ setup_dnsmasq() {
   [ $ETH0_IP ] && echo "dhcp-option=6,$NS" >> /etc/dnsmasq.conf
   [ $ETH0_IP6 ] && echo "dhcp-option=option6:dns-server,$NS6" >> /etc/dnsmasq.conf
 #adding the name data-server to the /etc/hosts for allowing the access to user-data service
and ssh-key reset in every subnet.
-  //removing the existing entires to avoid duplicates on restarts.
+#removing the existing entires to avoid duplicates on restarts.
   sed -i  '/data-server/d' /etc/hosts
   if [ -n "$ETH0_IP" ]
           then


Mime
View raw message