This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push: new 263559c systemvmtemplate: Bigger partition size and ambiguous redirect bugfix (#2832) 263559c is described below commit 263559c19e2aa88adee786ec8111e01a20b990fd Author: Dennis Konrad <33484272+denniskon...@users.noreply.github.com> AuthorDate: Fri Aug 31 13:47:51 2018 +0200 systemvmtemplate: Bigger partition size and ambiguous redirect bugfix (#2832) Fix partition sizes to allow the building of systemvmtemplate, and fix ambiguous redirect fix. --- tools/appliance/shar_cloud_scripts.sh | 2 +- tools/appliance/systemvmtemplate/http/preseed.cfg | 4 ++-- tools/appliance/systemvmtemplate/template.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/appliance/shar_cloud_scripts.sh b/tools/appliance/shar_cloud_scripts.sh index 7847b85..853a956 100755 --- a/tools/appliance/shar_cloud_scripts.sh +++ b/tools/appliance/shar_cloud_scripts.sh @@ -44,7 +44,7 @@ cd ${CLOUDSTACK_DIR}/systemvm/debian tar -cf ${TEMP_DIR}/cloud_scripts/usr/share/cloud/cloud-scripts.tar * cd ${TEMP_DIR} -shar `find . -print` > ${CURR_DIR}/cloud_scripts_shar_archive.sh +shar `find . -print` > "${CURR_DIR}"/cloud_scripts_shar_archive.sh cd ${CURR_DIR} rm -rf ${TEMP_DIR} diff --git a/tools/appliance/systemvmtemplate/http/preseed.cfg b/tools/appliance/systemvmtemplate/http/preseed.cfg index 65a5733..aa63f0e 100644 --- a/tools/appliance/systemvmtemplate/http/preseed.cfg +++ b/tools/appliance/systemvmtemplate/http/preseed.cfg @@ -54,13 +54,13 @@ d-i partman-auto/disk string /dev/vda d-i partman-auto/method string regular d-i partman-auto/expert_recipe string \ boot-root :: \ - 60 60 60 ext2 \ + 100 60 100 ext2 \ $primary{ } $bootable{ } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext2 } \ mountpoint{ /boot } \ . \ - 975 40 1000 ext4 \ + 1175 40 1200 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ / } \ diff --git a/tools/appliance/systemvmtemplate/template.json b/tools/appliance/systemvmtemplate/template.json index 80ceae1..4810840 100644 --- a/tools/appliance/systemvmtemplate/template.json +++ b/tools/appliance/systemvmtemplate/template.json @@ -32,7 +32,7 @@ [ "-m", "512M" ], [ "-smp", "cpus=1,maxcpus=1,cores=1" ] ], - "disk_size": 1800, + "disk_size": 2000, "format": "qcow2", "disk_interface": "virtio",