Repository: cloudstack Updated Branches: refs/heads/master c1aa3a3f1 -> 9b26ca20f
build recent systemvm[64]templates Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b26ca20 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b26ca20 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b26ca20 Branch: refs/heads/master Commit: 9b26ca20fc0385e24bda56583b10f312d5d7aff3 Parents: c1aa3a3 Author: Daan Hoogland <[email protected]> Authored: Thu Feb 27 17:48:18 2014 +0100 Committer: Daan Hoogland <[email protected]> Committed: Thu Feb 27 17:48:18 2014 +0100 ---------------------------------------------------------------------- tools/appliance/build.sh | 2 +- tools/appliance/definitions/systemvm64template/definition.rb | 6 +++--- tools/appliance/definitions/systemvmtemplate/definition.rb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b26ca20/tools/appliance/build.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh index f150a83..6d2bd8f 100644 --- a/tools/appliance/build.sh +++ b/tools/appliance/build.sh @@ -78,7 +78,7 @@ which faketime >/dev/null 2>&1 && which vhd-util >/dev/null 2>&1 if [ $? == 0 ]; then set -e vboxmanage internalcommands converttoraw -format vdi "$hdd_path" img.raw - faketime '2010-01-01' vhd-util convert -s 0 -t 1 -i img.raw -o stagefixed.vhd + vhd-util convert -s 0 -t 1 -i img.raw -o stagefixed.vhd faketime '2010-01-01' vhd-util convert -s 1 -t 2 -i stagefixed.vhd -o $appliance-$branch-xen.vhd rm *.bak bzip2 $appliance-$branch-xen.vhd http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b26ca20/tools/appliance/definitions/systemvm64template/definition.rb ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvm64template/definition.rb b/tools/appliance/definitions/systemvm64template/definition.rb index e0b6b00..bea2fde 100644 --- a/tools/appliance/definitions/systemvm64template/definition.rb +++ b/tools/appliance/definitions/systemvm64template/definition.rb @@ -3,9 +3,9 @@ Veewee::Definition.declare({ :memory_size=> '256', :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off', :os_type_id => 'Debian_64', - :iso_file => "debian-7.3.0-amd64-netinst.iso", - :iso_src => "http://ftp.acc.umu.se/mirror/cdimage/release/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-netinst.iso";, - :iso_md5 => "72473e8a5e65b61acc7efde90d9f71d1", + :iso_file => "debian-7.4.0-amd64-netinst.iso", + :iso_src => "http://ftp.acc.umu.se/mirror/cdimage/release/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso";, + :iso_md5 => "e7e9433973f082a297793c3c5010b2c5", :iso_download_timeout => "1000", :boot_wait => "10", :boot_cmd_sequence => [ '<Esc>', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b26ca20/tools/appliance/definitions/systemvmtemplate/definition.rb ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb index 6f6a856..c8b24d6 100644 --- a/tools/appliance/definitions/systemvmtemplate/definition.rb +++ b/tools/appliance/definitions/systemvmtemplate/definition.rb @@ -3,9 +3,9 @@ Veewee::Definition.declare({ :memory_size=> '256', :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off', :os_type_id => 'Debian', - :iso_file => "debian-7.3.0-i386-netinst.iso", - :iso_src => "http://ftp.acc.umu.se/mirror/cdimage/release/7.3.0/i386/iso-cd/debian-7.3.0-i386-netinst.iso";, - :iso_md5 => "04c58f30744e64a0459caf7d7cace479", + :iso_file => "debian-7.4.0-i386-netinst.iso", + :iso_src => "http://ftp.acc.umu.se/mirror/cdimage/release/7.4.0/i386/iso-cd/debian-7.4.0-i386-netinst.iso";, + :iso_md5 => "7339b668a81b417ac023d73739dc6a03", :iso_download_timeout => "1000", :boot_wait => "10", :boot_cmd_sequence => [ '<Esc>',
