[GitHub] rhtyd closed pull request #2855: systemvm: export $TYPE before patching ssvm/cpvm

[GitBox <gi...@apache.org>]

rhtyd closed pull request #2855: systemvm: export $TYPE before patching ssvm/cpvm
URL: https://github.com/apache/cloudstack/pull/2855
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
index a35be45a8d9..d4bdc13b082 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
@@ -135,12 +135,12 @@ private void updateSystemVmTemplates(final Connection conn) {
 
         final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>() {
             {
-                put(Hypervisor.HypervisorType.KVM, "f44242570ae4a0b16c4c2eb2cb71fe45");
-                put(Hypervisor.HypervisorType.XenServer, "afcc31ab9f7635885cd83600eafbbe7f");
-                put(Hypervisor.HypervisorType.VMware, "54449e31530f14af930c80a3155a308f");
-                put(Hypervisor.HypervisorType.Hyperv, "7785df30fdbbacdead5acbfc15ae2c98");
-                put(Hypervisor.HypervisorType.LXC, "f44242570ae4a0b16c4c2eb2cb71fe45");
-                put(Hypervisor.HypervisorType.Ovm3, "81a6cd8d07fad910824f040f73ce03e3");
+                put(Hypervisor.HypervisorType.KVM, "6d12cc764cd7d64112d8c35d70923eb1");
+                put(Hypervisor.HypervisorType.XenServer, "6e8b3ae84ca8145736d1d7d3f7546e65");
+                put(Hypervisor.HypervisorType.VMware, "e981f8cb951688efd93481913198c9cc");
+                put(Hypervisor.HypervisorType.Hyperv, "e9032635ffba021371780307162551b9");
+                put(Hypervisor.HypervisorType.LXC, "6d12cc764cd7d64112d8c35d70923eb1");
+                put(Hypervisor.HypervisorType.Ovm3, "c4a91f8e52e4531a1c2a9a17c530d5fe");
             }
         };
 
diff --git a/systemvm/debian/opt/cloud/bin/setup/cloud-early-config b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config
index 2c277ae78ed..8ba7701de8a 100755
--- a/systemvm/debian/opt/cloud/bin/setup/cloud-early-config
+++ b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config
@@ -150,6 +150,10 @@ get_boot_params() {
   esac
 }
 
+get_systemvm_type() {
+  export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
+}
+
 patch() {
   local PATCH_MOUNT=/media/cdrom
   local patchfile=$PATCH_MOUNT/cloud-scripts.tgz
@@ -216,11 +220,11 @@ start() {
 
   config_guest
   get_boot_params
+  get_systemvm_type
   patch
   sync
   sysctl -p
 
-  export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
   log_it "Configuring systemvm type=$TYPE"
 
   if [ -f "/opt/cloud/bin/setup/$TYPE.sh" ]; then
diff --git a/systemvm/debian/opt/cloud/bin/setup/postinit.sh b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
index 5132d5e85d4..f0ae5e89f0c 100755
--- a/systemvm/debian/opt/cloud/bin/setup/postinit.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
@@ -21,7 +21,7 @@
 # Eject cdrom if any
 eject || true
 
-TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
+TYPE=$(grep -Po 'type=\K[a-zA-Z]*' /var/cache/cloud/cmdline)
 if [ "$TYPE" == "router" ] || [ "$TYPE" == "vpcrouter" ] || [ "$TYPE" == "dhcpsrvr" ]
 then
   if [ -x /opt/cloud/bin/update_config.py ]
diff --git a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
index 7af9212e343..48695014bd9 100644
--- a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
+++ b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
@@ -19,7 +19,7 @@
 set -e
 set -x
 
-CLOUDSTACK_RELEASE=4.11.1
+CLOUDSTACK_RELEASE=4.11.2
 
 function configure_apache2() {
    # Enable ssl, rewrite and auth


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services