cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaya...@apache.org
Subject git commit: updated refs/heads/4.2 to 421c846
Date Tue, 30 Sep 2014 11:50:10 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.2 a2b620c0b -> 421c8461f


CLOUDSTACK-7655: Fixing system vm template to build from newer debian iso links

Signed-off-by: Jayapal <jayapal@apache.org>


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

Branch: refs/heads/4.2
Commit: 421c8461f1c5482bec9f1d5df38d39bf50017d21
Parents: a2b620c
Author: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Authored: Tue Sep 30 15:54:45 2014 +0530
Committer: Jayapal <jayapal@apache.org>
Committed: Tue Sep 30 17:16:06 2014 +0530

----------------------------------------------------------------------
 tools/appliance/definitions/systemvmtemplate/definition.rb    | 6 +++---
 tools/appliance/definitions/systemvmtemplate/postinstall.sh   | 2 ++
 tools/appliance/definitions/systemvmtemplate64/definition.rb  | 6 +++---
 tools/appliance/definitions/systemvmtemplate64/postinstall.sh | 2 ++
 4 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/421c8461/tools/appliance/definitions/systemvmtemplate/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
index 54c85aa..c9f0ba4 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.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",
-  :iso_md5 => "a6b93666a5393334accb7ac4ee28d949",
+  :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_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
      '<Esc>',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/421c8461/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index dc3d130..51006c9 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -31,6 +31,8 @@ install_packages() {
   DEBIAN_FRONTEND=noninteractive
   DEBIAN_PRIORITY=critical
 
+  DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -qq -y --force-yes upgrade
+
   # Basic packages
   apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig
insserv net-tools ifupdown vim-tiny netbase iptables
   apt-get --no-install-recommends -q -y --force-yes install openssh-server openssl e2fsprogs
dhcp3-client tcpdump socat wget

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/421c8461/tools/appliance/definitions/systemvmtemplate64/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate64/definition.rb b/tools/appliance/definitions/systemvmtemplate64/definition.rb
index 713ee75..cd7e146 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.0.0-amd64-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso",
-  :iso_md5 => "e7e9433973f082a297793c3c5010b2c5",
+  :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_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
      '<Esc>',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/421c8461/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
index a330cea..515348c 100644
--- a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
@@ -32,6 +32,8 @@ install_packages() {
   DEBIAN_FRONTEND=noninteractive
   DEBIAN_PRIORITY=critical
 
+  DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -qq -y --force-yes upgrade
+
   # Basic packages
   apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig
insserv net-tools ifupdown vim-tiny netbase iptables
   apt-get --no-install-recommends -q -y --force-yes install openssh-server openssl e2fsprogs
dhcp3-client tcpdump socat wget


Mime
View raw message