You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/10/17 14:57:49 UTC
git commit: updated refs/heads/master to 7894386
Updated Branches:
refs/heads/master 7a7fb61a1 -> 789438651
Fix systemvm build scripts with the new location of the systemvm patches.
And wondering why they are included here and not in the systemvm.iso.
Also giving the systemvm a little more space to fix the out-of-diskspace error during the build
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/78943865
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/78943865
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/78943865
Branch: refs/heads/master
Commit: 789438651a1baa21937b2639c12769610bdcc421
Parents: 7a7fb61
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Thu Oct 17 14:56:06 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Thu Oct 17 14:57:33 2013 +0200
----------------------------------------------------------------------
tools/appliance/definitions/systemvmtemplate/definition.rb | 2 +-
tools/appliance/definitions/systemvmtemplate/postinstall.sh | 8 ++++----
tools/appliance/definitions/systemvmtemplate64/definition.rb | 2 +-
.../appliance/definitions/systemvmtemplate64/postinstall.sh | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78943865/tools/appliance/definitions/systemvmtemplate/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
index 54c85aa..33f25b2 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 => '2000', :disk_format => 'VDI', :hostiocache => 'off',
+ :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
:os_type_id => 'Debian',
:iso_file => "debian-7.0.0-i386-netinst.iso",
:iso_src => "http://cdimage.debian.org/mirror/cdimage/archive/7.0.0/i386/iso-cd/debian-7.0.0-i386-netinst.iso",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78943865/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 997d854..caee7b3 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -203,12 +203,12 @@ configure_services() {
cd /opt
wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz
tar -zxvf cloudstack.tar.gz
- cp -rv $snapshot_dir/patches/systemvm/debian/config/* /
- cp -rv $snapshot_dir/patches/systemvm/debian/vpn/* /
+ cp -rv $snapshot_dir/systemvm/patches/debian/config/* /
+ cp -rv $snapshot_dir/systemvm/patches/debian/vpn/* /
mkdir -p /usr/share/cloud/
- cd $snapshot_dir/patches/systemvm/debian/config
+ cd $snapshot_dir/systemvm/patches/debian/config
tar -cvf /usr/share/cloud/cloud-scripts.tar *
- cd $snapshot_dir/patches/systemvm/debian/vpn
+ cd $snapshot_dir/systemvm/patches/debian/vpn
tar -rvf /usr/share/cloud/cloud-scripts.tar *
cd /opt
rm -fr $snapshot_dir cloudstack.tar.gz
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78943865/tools/appliance/definitions/systemvmtemplate64/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate64/definition.rb b/tools/appliance/definitions/systemvmtemplate64/definition.rb
index 30f2849..454145d 100644
--- a/tools/appliance/definitions/systemvmtemplate64/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate64/definition.rb
@@ -1,7 +1,7 @@
Veewee::Definition.declare({
:cpu_count => '1',
:memory_size=> '256',
- :disk_size => '2000', :disk_format => 'VDI', :hostiocache => 'off',
+ :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
:os_type_id => 'Debian_64',
:iso_file => "debian-7.0.0-amd64-netinst.iso",
:iso_src => "http://cdimage.debian.org/mirror/cdimage/archive/7.0.0/amd64/iso-cd/debian-7.0.0-amd64-netinst.iso",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78943865/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
index 53ae2bb..9297731 100644
--- a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
@@ -203,12 +203,12 @@ configure_services() {
cd /opt
wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz
tar -zxvf cloudstack.tar.gz
- cp -rv $snapshot_dir/patches/systemvm/debian/config/* /
- cp -rv $snapshot_dir/patches/systemvm/debian/vpn/* /
+ cp -rv $snapshot_dir/systemvm/patches/debian/config/* /
+ cp -rv $snapshot_dir/systemvm/patches/debian/vpn/* /
mkdir -p /usr/share/cloud/
- cd $snapshot_dir/patches/systemvm/debian/config
+ cd $snapshot_dir/systemvm/patches/debian/config
tar -cvf /usr/share/cloud/cloud-scripts.tar *
- cd $snapshot_dir/patches/systemvm/debian/vpn
+ cd $snapshot_dir/systemvm/patches/debian/vpn
tar -rvf /usr/share/cloud/cloud-scripts.tar *
cd /opt
rm -fr $snapshot_dir cloudstack.tar.gz