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/02/28 11:46:17 UTC
git commit: refs/heads/master - CLOUDSTACK-1340: Fix locale, cmd,
disk size and remove multiple apt-get installs
Updated Branches:
refs/heads/master 6380e2004 -> 80a6aaf7e
CLOUDSTACK-1340: Fix locale, cmd, disk size and remove multiple apt-get installs
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/80a6aaf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/80a6aaf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/80a6aaf7
Branch: refs/heads/master
Commit: 80a6aaf7e1b398de5e897e7a56845c7aa8f6c53f
Parents: 6380e20
Author: Rohit Yadav <bh...@apache.org>
Authored: Thu Feb 28 16:11:31 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Thu Feb 28 16:15:09 2013 +0530
----------------------------------------------------------------------
tools/appliance/build.sh | 4 ++--
.../definitions/systemvmtemplate/definition.rb | 2 +-
.../definitions/systemvmtemplate/postinstall.sh | 13 ++++++++++++-
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/80a6aaf7/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index b757ded..60b43bd 100644
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -51,13 +51,13 @@ rm -fr dist
mkdir dist
# Export for Xen
-vboxmange internalcommands converttoraw $hdd_path dist/raw.img
+vboxmanage internalcommands converttoraw $hdd_path dist/raw.img
vhd-util convert -s 0 -t 1 -i dist/raw.img -o dist/$appliance-$build_date-$branch-xen.vhd
bzip2 dist/$appliance-$build_date-$branch-xen.vhd
echo "$appliance exported for Xen: dist/$appliance-$build_date-$branch-xen.vhd.bz2"
# Export for KVM
-vboxmange internalcommands converttoraw $hdd_path dist/raw.img
+vboxmanage internalcommands converttoraw $hdd_path dist/raw.img
qemu-img convert -f raw -O qcow2 dist/raw.img dist/$appliance-$build_date-$branch-kvm.qcow2
rm dist/raw.img
bzip2 dist/$appliance-$build_date-$branch-kvm.qcow2
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/80a6aaf7/tools/appliance/definitions/systemvmtemplate/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
index df9589c..a6be769 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -1,7 +1,7 @@
Veewee::Definition.declare({
:cpu_count => '1',
:memory_size=> '256',
- :disk_size => '2048', :disk_format => 'VDI', :hostiocache => 'off',
+ :disk_size => '2000', :disk_format => 'VDI', :hostiocache => 'off',
:os_type_id => 'Debian',
:iso_file => "debian-wheezy-DI-b4-i386-netinst.iso",
:iso_src => "http://cdimage.debian.org/cdimage/wheezy_di_beta4/i386/iso-cd/debian-wheezy-DI-b4-i386-netinst.iso",
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/80a6aaf7/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index cbe2aab..268379c 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -27,7 +27,7 @@ install_packages() {
# Basic packages
apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables
- apt-get --no-install-recommends -q -y --force-yes install openssh-server openssl grub-legacy e2fsprogs dhcp3-client dnsmasq tcpdump socat wget
+ apt-get --no-install-recommends -q -y --force-yes install openssh-server openssl grub-legacy e2fsprogs dhcp3-client tcpdump socat wget
apt-get --no-install-recommends -q -y --force-yes install python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping
apt-get --no-install-recommends -q -y --force-yes install dnsutils zip unzip ethtool uuid file iproute acpid virt-what sudo
@@ -127,11 +127,22 @@ fix_hostname() {
sed -i '/127.0.1.1/d' /etc/hosts
}
+fix_locale() {
+ cat >> /etc/default/locale << EOF
+LANG=en_US.UTF-8
+LC_ALL=en_US.UTF-8
+EOF
+ cat >> /etc/locale.gen << EOF
+en_US.UTF-8 UTF-8
+EOF
+}
+
do_fixes() {
fix_nameserver
fix_inittab
fix_acpid
fix_hostname
+ fix_locale
}
configure_apache2() {