cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/4] git commit: updated refs/heads/master to e7638c0
Date Wed, 21 Oct 2015 21:16:19 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master c7ca952f2 -> e7638c028


CLOUDSTACK-8933 SSVm and CPVM do not survive a reboot from API


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

Branch: refs/heads/master
Commit: ac68f2a116650f9bebc80b183261ba350f8a7db7
Parents: 6fe5ae0
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Wed Dec 24 16:48:55 2014 +0530
Committer: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Committed: Tue Oct 20 10:50:14 2015 +0200

----------------------------------------------------------------------
 .../patches/debian/config/etc/init.d/cloud-early-config  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac68f2a1/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 79a85e7..d25366e 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -117,7 +117,7 @@ get_boot_params() {
           if [ ! -e /dev/vport0p1 ]; then
             log_it "/dev/vport0p1 not loaded, perhaps guest kernel is too old." &&
exit 2
           fi
-          while [ -z "$cmd" ]; do
+	  while [ -z "$cmd" ]; do         
             while read line; do
               if [[ $line == cmdline:* ]]; then
                 cmd=${line//cmdline:/}
@@ -128,7 +128,14 @@ get_boot_params() {
                 echo $pubkey > /root/.ssh/authorized_keys
               fi
             done < /dev/vport0p1
-	  done
+            # In case of reboot we do not send the boot args again.
+            # so need not wait for them, as the boot args are already set at startup
+            if [ -s /var/cache/cloud/cmdline  ]
+            then
+                log_it "found a non empty cmdline file continuing"
+                break;
+            fi
+	 done
           chmod go-rwx /root/.ssh/authorized_keys
           ;;
      vmware)


Mime
View raw message