From 789438651a1baa21937b2639c12769610bdcc421 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Thu, 17 Oct 2013 14:56:06 +0200 Subject: [PATCH] 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 --- .../appliance/definitions/systemvmtemplate/definition.rb | 2 +- .../appliance/definitions/systemvmtemplate/postinstall.sh | 8 ++++---- .../definitions/systemvmtemplate64/definition.rb | 2 +- .../definitions/systemvmtemplate64/postinstall.sh | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb index 54c85aa60ef..33f25b2c31e 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", diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh index 997d8548501..caee7b36a5e 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 diff --git a/tools/appliance/definitions/systemvmtemplate64/definition.rb b/tools/appliance/definitions/systemvmtemplate64/definition.rb index 30f2849978d..454145d3bd0 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", diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh index 53ae2bb0e5a..929773101c2 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