cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/4.2 to 14b8468
Date Thu, 30 Oct 2014 12:29:47 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.2 d0db137d8 -> 14b846877


CLOUDSTACK-7817: use debian 7.7.0 in the definition.rb


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14b84687
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14b84687
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14b84687

Branch: refs/heads/4.2
Commit: 14b846877e6c79794e7d60b058a67f4b8e98dab6
Parents: d0db137
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Thu Oct 30 17:57:55 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Thu Oct 30 17:59:32 2014 +0530

----------------------------------------------------------------------
 tools/appliance/build.sh                                     | 2 +-
 tools/appliance/definitions/systemvmtemplate/definition.rb   | 6 +++---
 tools/appliance/definitions/systemvmtemplate64/definition.rb | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14b84687/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 595dd58..3ce9db1 100644
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -68,7 +68,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-$build_date-$branch-xen.vhd
   rm *.bak
   bzip2 $appliance-$build_date-$branch-xen.vhd

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14b84687/tools/appliance/definitions/systemvmtemplate/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
index c9f0ba4..fd4dbf7 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 => '2000', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
-  :iso_file => "debian-7.5.0-i386-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/i386/iso-cd/debian-7.5.0-i386-netinst.iso",
-  :iso_md5 => "0e6eaacb5a5828473afe90f6df9c8f16",
+  :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_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
      '<Esc>',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14b84687/tools/appliance/definitions/systemvmtemplate64/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate64/definition.rb b/tools/appliance/definitions/systemvmtemplate64/definition.rb
index cd7e146..4f547b2 100644
--- a/tools/appliance/definitions/systemvmtemplate64/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate64/definition.rb
@@ -3,9 +3,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2000', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
-  :iso_file => "debian-7.5.0-amd64-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-netinst.iso",
-  :iso_md5 => "8fdb6715228ea90faba58cb84644d296",
+  :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_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
      '<Esc>',


Mime
View raw message