cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [03/47] git commit: updated refs/heads/internallb to 3795048
Date Thu, 11 Apr 2013 21:22:26 GMT
Revert "appliance: Revertible patch to create half baked template for vmware"

This reverts commit 91faf2d14aed94dbb403febf7d8a2c4b22cc7d1a.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d39a06c0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d39a06c0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d39a06c0

Branch: refs/heads/internallb
Commit: d39a06c0e92236e7ece548dd9c77b946ae438da7
Parents: 91faf2d
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Thu Apr 11 15:35:28 2013 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Thu Apr 11 15:35:28 2013 +0530

----------------------------------------------------------------------
 .../definitions/systemvmtemplate/postinstall.sh    |    7 ++-----
 .../definitions/systemvmtemplate/preseed.cfg       |   11 ++++++++---
 2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d39a06c0/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index a19f515..ae8f1ad 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,9 +186,6 @@ 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/d39a06c0/tools/appliance/definitions/systemvmtemplate/preseed.cfg
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index 61a0b38..6996565 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 }                     \
               .                                               \
-              500 40 400 ext4                                 \
+              300 40 400 ext4                                 \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ / }                         \
@@ -146,12 +146,17 @@ d-i partman-auto/expert_recipe string                         \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /home }                     \
               .                                               \
-              900 20 1100 ext4                                \
+              650 20 1100 ext4                                \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /usr }                      \
               .                                               \
-              400 60 1000 ext4                                \
+              400 40 500 ext4                                 \
+                      method{ format } format{ }              \
+                      use_filesystem{ } filesystem{ ext4 }    \
+                      mountpoint{ /opt }                      \
+              .                                               \
+              450 60 1000 ext4                                \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /var }                      \


Mime
View raw message