Merge branch '4.11'

CLOUDSTACK-10341: VR minor fixes to systemvmtemplate (#2468)
CLOUDSTACK-10340: Add setter to hypervisorType in VMInstanceVO (#2504)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java

@@ -267,6 +267,10 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
         return hypervisorType;
     }
 
+    public void setHypervisorType(HypervisorType hypervisorType) {
+        this.hypervisorType = hypervisorType;
+    }
+
     @Override
     public Date getCreated() {
         return created;

systemvm/debian/etc/rsyslog.conf

@@ -92,7 +92,7 @@ news.notice			-/var/log/news/news.notice
 #
 # Emergencies are sent to everybody logged in.
 #
-*.emerg				*
+*.emerg				:omusrmsg:*
 
 #
 # I like to have messages displayed on the console, but only on a virtual

systemvm/debian/etc/systemd/system/cloud-postinit.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=CloudStack post-patching init script
 After=cloud-early-config.service network.target local-fs.target
-Before=ssh.service
+Before=ssh.service apache2.service
 Requires=network.service
 
 [Install]

tools/appliance/systemvmtemplate/scripts/finalize.sh

@@ -24,6 +24,12 @@ function configure_misc() {
   echo "cloud:`openssl rand -base64 32`" | chpasswd
 }
 
+function configure_rundisk_size() {
+  # Debian's default is 10% of total RAM. This is too low when total is 256M.
+  # See https://manpages.debian.org/stretch/initscripts/tmpfs.5.en.html
+  echo "tmpfs /run tmpfs nodev,nosuid,size=20%,mode=755 0 0" >> /etc/fstab
+}
+
 function configure_sudoers() {
   cat >/etc/sudoers <<END
 Defaults	env_reset
@@ -63,6 +69,7 @@ function zero_disk() {
 
 function finalize() {
   configure_misc
+  configure_rundisk_size
   configure_sudoers
   cleanup_final
   sync