cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [12/50] git commit: updated refs/heads/master to 1290e10
Date Mon, 22 Sep 2014 19:44:11 GMT
CLOUDSTACK-7143: consider vhdutil a software package


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

Branch: refs/heads/master
Commit: 3d4e4a6e09a37711169e7558af0ec53e11e969e7
Parents: 06c1c16
Author: Leo Simons <lsimons@schubergphilis.com>
Authored: Mon Jul 21 12:02:13 2014 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Sep 22 21:37:18 2014 +0200

----------------------------------------------------------------------
 .../systemvmtemplate/install_systemvm_packages.sh        |  6 ++++++
 .../definitions/systemvmtemplate/postinstall.sh          | 11 -----------
 2 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d4e4a6e/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
index daa0efe..06e91b0 100644
--- a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
+++ b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
@@ -1,3 +1,8 @@
+fix_vhdutil() {
+  wget --no-check-certificate http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -O
/bin/vhd-util
+  chmod a+x /bin/vhd-util
+}
+
 install_packages() {
   DEBIAN_FRONTEND=noninteractive
   DEBIAN_PRIORITY=critical
@@ -86,3 +91,4 @@ install_packages() {
 }
 
 install_packages
+fix_vhdutil

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d4e4a6e/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index cf995dc..e6d5073 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -21,15 +21,6 @@ ROOTPW=password
 HOSTNAME=systemvm
 CLOUDSTACK_RELEASE=4.5.0
 
-fix_vhdutil() {
-  wget --no-check-certificate http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -O
/bin/vhd-util
-  chmod a+x /bin/vhd-util
-}
-
-do_fixes() {
-  fix_vhdutil
-}
-
 configure_apache2() {
    # Enable ssl, rewrite and auth
    a2enmod ssl rewrite auth_basic auth_digest
@@ -92,8 +83,6 @@ begin=$(date +%s)
 configure_services
 configure_apache2
 echo "*************DONE SETTING UP SERVICES********************"
-do_fixes
-echo "*************DONE FIXING CONFIGURATION********************"
 do_signature
 
 fin=$(date +%s)


Mime
View raw message