From b8deb6ba3f72d7da1944c47ee60db3ff4127da6c Mon Sep 17 00:00:00 2001
From: Joris van Lieshout <jvanlieshout@schubergphilis.com>
Date: Tue, 20 May 2014 16:21:00 +0200
Subject: [PATCH] volume /usr was sized to small and ends up being 100% full on
 SSVMs and CVMs. By juggling some partman-auto numbers the space gets devided
 more evenly. After this patch /usr should be around 80% full. I've also
 reduced the swap space because this makes no sense on virtual instances.

Signed-off-by: Daan Hoogland <daan@onecht.net>
---
 .../definitions/systemvm64template/preseed.cfg         | 10 +++++-----
 .../appliance/definitions/systemvmtemplate/preseed.cfg | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/appliance/definitions/systemvm64template/preseed.cfg b/tools/appliance/definitions/systemvm64template/preseed.cfg
index 635432a6c56..d11b625e44d 100644
--- a/tools/appliance/definitions/systemvm64template/preseed.cfg
+++ b/tools/appliance/definitions/systemvm64template/preseed.cfg
@@ -136,7 +136,7 @@ d-i partman-auto/expert_recipe string                         \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /boot }                     \
               .                                               \
-              300 40 400 ext4                                 \
+              250 40 400 ext4                                 \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ / }                         \
@@ -146,7 +146,7 @@ d-i partman-auto/expert_recipe string                         \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /home }                     \
               .                                               \
-              650 20 1100 ext4                                \
+              700 70 1100 ext4                                \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /usr }                      \
@@ -156,17 +156,17 @@ d-i partman-auto/expert_recipe string                         \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /opt }                      \
               .                                               \
-              450 60 1000 ext4                                \
+              450 70 1000 ext4                                \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /var }                      \
               .                                               \
-              50 70 400 ext4                                 \
+              50 60 100 ext4                                  \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /tmp }                      \
               .                                               \
-              70 512 300% linux-swap                          \
+              70 100 256 linux-swap                           \
                       method{ swap } format{ }                \
               .
 
diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index deb2f94d49f..1e4fb4ef8c4 100644
--- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg
+++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
@@ -136,7 +136,7 @@ d-i partman-auto/expert_recipe string                         \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /boot }                     \
               .                                               \
-              300 40 400 ext4                                 \
+              250 40 400 ext4                                 \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ / }                         \
@@ -146,7 +146,7 @@ d-i partman-auto/expert_recipe string                         \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /home }                     \
               .                                               \
-              650 20 1100 ext4                                \
+              700 70 1100 ext4                                \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /usr }                      \
@@ -156,17 +156,17 @@ d-i partman-auto/expert_recipe string                         \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /opt }                      \
               .                                               \
-              450 60 1000 ext4                                \
+              450 70 1000 ext4                                \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /var }                      \
               .                                               \
-              50 70 400 ext4                                 \
+              50 60 100 ext4                                  \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /tmp }                      \
               .                                               \
-              70 512 300% linux-swap                          \
+              70 100 256 linux-swap                           \
                       method{ swap } format{ }                \
               .