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 2015/01/28 13:38:53 UTC
git commit: updated refs/heads/4.3 to 61563d7
Repository: cloudstack
Updated Branches:
refs/heads/4.3 f5f6c2d1a -> 61563d71e
appliance: use latest debian 7.8
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/61563d71
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61563d71
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61563d71
Branch: refs/heads/4.3
Commit: 61563d71ed5a9666acaec75434041cca1fa33057
Parents: f5f6c2d
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 28 18:08:24 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Jan 28 18:08:24 2015 +0530
----------------------------------------------------------------------
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/61563d71/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index a9c0a0a..e11bf20 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -77,7 +77,7 @@ if [ $? == 0 ]; then
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
faketime '2010-01-01' vhd-util convert -s 1 -t 2 -i stagefixed.vhd -o $appliance-$build_date-$branch-xen.vhd
- rm *.bak
+ rm -f *.bak
bzip2 $appliance-$build_date-$branch-xen.vhd
echo "$appliance exported for Xen: dist/$appliance-$build_date-$branch-xen.vhd.bz2"
else
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61563d71/tools/appliance/definitions/systemvm64template/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/definition.rb b/tools/appliance/definitions/systemvm64template/definition.rb
index e4dc861..7275bd7 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.7.0-amd64-netinst.iso",
- :iso_src => "http://cdimage.debian.org/debian-cd/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-netinst.iso",
- :iso_md5 => "0b31bccccb048d20b551f70830bb7ad0",
+ :iso_file => "debian-7.8.0-amd64-netinst.iso",
+ :iso_src => "http://cdimage.debian.org/debian-cd/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-netinst.iso",
+ :iso_md5 => "a91fba5001cf0fbccb44a7ae38c63b6e",
:iso_download_timeout => "1000",
:boot_wait => "10", :boot_cmd_sequence => [
'<Esc>',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61563d71/tools/appliance/definitions/systemvmtemplate/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
index 46facd5..2d224a3 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.7.0-i386-netinst.iso",
- :iso_src => "http://cdimage.debian.org/debian-cd/7.7.0/i386/iso-cd/debian-7.7.0-i386-netinst.iso",
- :iso_md5 => "76d512c44a9b7eca53ea2812ad5ac36f",
+ :iso_file => "debian-7.8.0-i386-netinst.iso",
+ :iso_src => "http://cdimage.debian.org/debian-cd/7.8.0/i386/iso-cd/debian-7.8.0-i386-netinst.iso",
+ :iso_md5 => "0d2f88d23a9d5945f5bc0276830c7d2c",
:iso_download_timeout => "1000",
:boot_wait => "10", :boot_cmd_sequence => [
'<Esc>',