You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/04/11 11:54:34 UTC
git commit: updated refs/heads/master to 91faf2d
Updated Branches:
refs/heads/master 5cd360852 -> 91faf2d14
appliance: Revertible patch to create half baked template for vmware
This is to allow buildjob to produce semi-automate template for vmware.
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/91faf2d1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/91faf2d1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/91faf2d1
Branch: refs/heads/master
Commit: 91faf2d14aed94dbb403febf7d8a2c4b22cc7d1a
Parents: 5cd3608
Author: Rohit Yadav <bh...@apache.org>
Authored: Thu Apr 11 15:23:04 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Thu Apr 11 15:23:04 2013 +0530
----------------------------------------------------------------------
.../definitions/systemvmtemplate/postinstall.sh | 7 +++++--
.../definitions/systemvmtemplate/preseed.cfg | 11 +++--------
2 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91faf2d1/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index ae8f1ad..a19f515 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -64,9 +64,9 @@ install_packages() {
apt-get --no-install-recommends -q -y --force-yes install iptables-persistent
# vmware tools
- apt-get --no-install-recommends -q -y --force-yes install open-vm-tools
+ #apt-get --no-install-recommends -q -y --force-yes install open-vm-tools
# commented installaion of vmware-tools as we are using the opensource open-vm-tools:
- # apt-get --no-install-recommends -q -y --force-yes install build-essential linux-headers-`uname -r`
+ apt-get --no-install-recommends -q -y --force-yes install build-essential linux-headers-`uname -r`
# df -h
# PREVDIR=$PWD
# cd /opt
@@ -186,6 +186,9 @@ configure_services() {
snapshot_dir="/opt/cloudstack*"
cd /opt
wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz
+}
+
+cfg_cloud_early() {
tar -zxvf cloudstack.tar.gz
cp -rv $snapshot_dir/patches/systemvm/debian/config/* /
cp -rv $snapshot_dir/patches/systemvm/debian/vpn/* /
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91faf2d1/tools/appliance/definitions/systemvmtemplate/preseed.cfg
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index 6996565..61a0b38 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 \
+ 500 40 400 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
@@ -146,17 +146,12 @@ d-i partman-auto/expert_recipe string \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /home } \
. \
- 650 20 1100 ext4 \
+ 900 20 1100 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /usr } \
. \
- 400 40 500 ext4 \
- method{ format } format{ } \
- use_filesystem{ } filesystem{ ext4 } \
- mountpoint{ /opt } \
- . \
- 450 60 1000 ext4 \
+ 400 60 1000 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \