From 263559c19e2aa88adee786ec8111e01a20b990fd Mon Sep 17 00:00:00 2001
From: Dennis Konrad <33484272+DennisKonrad@users.noreply.github.com>
Date: Fri, 31 Aug 2018 13:47:51 +0200
Subject: [PATCH] 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 7847b855c33..853a9564d90 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 65a573374a9..aa63f0e6996 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 80ceae18441..4810840dbbe 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",