You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2018/01/09 12:48:54 UTC
[cloudstack] branch master updated: CLOUDSTACK-10013: Fix
systemvmtemplate build failure
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new c9afa8e CLOUDSTACK-10013: Fix systemvmtemplate build failure
c9afa8e is described below
commit c9afa8e5b4d3787f5212cc0205b86ded0c89a1d7
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Jan 9 17:58:02 2018 +0530
CLOUDSTACK-10013: Fix systemvmtemplate build failure
This enables security updates in preseed file and removes purges
old kernel, and increases maximum /boot partition size. Build failures
were found due to insufficient space in /boot. Tested with packer+qemu
on Ubuntu 17.10.
Also silently remove xmas cloudstack cloudmonkey logo without hurting
anyone's sentiments (no monkeys were harmed in this commit ;).
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
README.md | 2 +-
tools/appliance/systemvmtemplate/http/preseed.cfg | 5 +++--
tools/appliance/systemvmtemplate/scripts/apt_upgrade.sh | 4 +++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 41d00bc..17a7a8f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Apache CloudStack [![Build Status](https://travis-ci.org/apache/cloudstack.svg?branch=master)](https://travis-ci.org/apache/cloudstack) [![Coverity Scan Build Status](https://scan.coverity.com/projects/943/badge.svg)](https://scan.coverity.com/projects/943)
-![Apache CloudStack](tools/logo/acsxmas.jpg)
+![Apache CloudStack](tools/logo/apache_cloudstack.png)
Apache CloudStack is open source software designed to deploy and manage large
networks of virtual machines, as a highly available, highly scalable
diff --git a/tools/appliance/systemvmtemplate/http/preseed.cfg b/tools/appliance/systemvmtemplate/http/preseed.cfg
index b4a076f..cdb649a 100644
--- a/tools/appliance/systemvmtemplate/http/preseed.cfg
+++ b/tools/appliance/systemvmtemplate/http/preseed.cfg
@@ -38,6 +38,7 @@ d-i mirror/http/proxy string
### Apt setup
d-i apt-setup/cdrom/set-first false
+d-i apt-setup/security-updates boolean true
d-i apt-setup/services-select multiselect security, updates
d-i apt-setup/security_host string security.debian.org
d-i apt-setup/local0/source boolean false
@@ -53,7 +54,7 @@ d-i partman-auto/disk string /dev/vda
d-i partman-auto/method string regular
d-i partman-auto/expert_recipe string \
boot-root :: \
- 80 50 100 ext2 \
+ 80 50 160 ext2 \
$primary{ } $bootable{ } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext2 } \
@@ -105,7 +106,7 @@ openssh-server openssh-server/permit-root-login boolean true
tasksel tasksel/first multiselect ssh-server
d-i pkgsel/include string openssh-server ntp acpid sudo bzip2 openssl
# Allowed values: none, safe-upgrade, full-upgrade
-d-i pkgsel/upgrade select none
+d-i pkgsel/upgrade select full-upgrade
popularity-contest popularity-contest/participate boolean false
diff --git a/tools/appliance/systemvmtemplate/scripts/apt_upgrade.sh b/tools/appliance/systemvmtemplate/scripts/apt_upgrade.sh
index e4b779b..ac48b6b 100644
--- a/tools/appliance/systemvmtemplate/scripts/apt_upgrade.sh
+++ b/tools/appliance/systemvmtemplate/scripts/apt_upgrade.sh
@@ -24,10 +24,11 @@ function fix_tune2fs() {
for partition in $(blkid -o list | grep ext | awk '{print $1}')
do
tune2fs -m 1 $partition
- tune2fs -c 2 $partition
+ tune2fs -c 3 $partition
done
fdisk -l
df -h
+ uname -a
}
function add_backports() {
@@ -54,6 +55,7 @@ function apt_upgrade() {
apt-get -q -y update
apt-get -q -y upgrade
apt-get -q -y dist-upgrade
+ apt-get -y remove --purge linux-image-4.9.0-4-amd64
apt-get -y autoremove --purge
apt-get autoclean
apt-get clean
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].