[GitHub] rhtyd closed pull request #2468: [4.11] VR: minor fixes

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

rhtyd closed pull request #2468: [4.11] VR: minor fixes
URL: https://github.com/apache/cloudstack/pull/2468
 
 
   

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/systemvm/debian/etc/rsyslog.conf b/systemvm/debian/etc/rsyslog.conf
index 8dc7c7504ca..c7de03d5ad6 100644
--- a/systemvm/debian/etc/rsyslog.conf
+++ b/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
diff --git a/systemvm/debian/etc/systemd/system/cloud-postinit.service b/systemvm/debian/etc/systemd/system/cloud-postinit.service
index c23516e67ff..19ddfcc6384 100644
--- a/systemvm/debian/etc/systemd/system/cloud-postinit.service
+++ b/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]
diff --git a/tools/appliance/systemvmtemplate/scripts/finalize.sh b/tools/appliance/systemvmtemplate/scripts/finalize.sh
index 260bddff4e5..e5d15ecb61c 100644
--- a/tools/appliance/systemvmtemplate/scripts/finalize.sh
+++ b/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


 

----------------------------------------------------------------
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