From b4d0cf482c5eccc241fb644912a57ca1fb042ccd Mon Sep 17 00:00:00 2001 From: Dennis Konrad Date: Thu, 30 Aug 2018 15:06:29 +0200 Subject: [PATCH 1/3] Bigger partiton table for SVM & ambigous redirect bugfix --- tools/appliance/shar_cloud_scripts.sh | 2 +- tools/appliance/systemvmtemplate/http/preseed.cfg | 2 +- tools/appliance/systemvmtemplate/template.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/appliance/shar_cloud_scripts.sh b/tools/appliance/shar_cloud_scripts.sh index 7847b855c33d..853a9564d90c 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 65a573374a90..9d8933e31e84 100644 --- a/tools/appliance/systemvmtemplate/http/preseed.cfg +++ b/tools/appliance/systemvmtemplate/http/preseed.cfg @@ -60,7 +60,7 @@ d-i partman-auto/expert_recipe string \ 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 80ceae184416..4810840dbbe8 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", From 3153cf9235a125afb4e3484da926596df8c2800f Mon Sep 17 00:00:00 2001 From: Dennis Konrad Date: Thu, 30 Aug 2018 15:26:29 +0200 Subject: [PATCH 2/3] Increase size of /boot --- tools/appliance/systemvmtemplate/http/preseed.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/appliance/systemvmtemplate/http/preseed.cfg b/tools/appliance/systemvmtemplate/http/preseed.cfg index 9d8933e31e84..e41299ca5069 100644 --- a/tools/appliance/systemvmtemplate/http/preseed.cfg +++ b/tools/appliance/systemvmtemplate/http/preseed.cfg @@ -54,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 :: \ - 60 60 60 ext2 \ + 80 60 80 ext2 \ $primary{ } $bootable{ } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext2 } \ From b4fe57c39859f6369e9bb95fbfeceda55fbabdf5 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 31 Aug 2018 17:16:08 +0530 Subject: [PATCH 3/3] Fix boot partition size to 100, fix indents --- tools/appliance/systemvmtemplate/http/preseed.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/appliance/systemvmtemplate/http/preseed.cfg b/tools/appliance/systemvmtemplate/http/preseed.cfg index e41299ca5069..aa63f0e69966 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 :: \ - 80 60 80 ext2 \ + 100 60 100 ext2 \ $primary{ } $bootable{ } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext2 } \ mountpoint{ /boot } \ . \ - 1175 40 1200 ext4 \ + 1175 40 1200 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ / } \