[cloudstack] branch debian9-systemvmtemplate updated: fix template build

[bh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by this push:
     new 5e5c97e  fix template build
5e5c97e is described below

commit 5e5c97e17b0a34d0d5db79fe3b93484f4b4c7093
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Dec 5 13:06:31 2017 +0530

    fix template build
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
 tools/appliance/definitions/systemvmtemplate/cleanup.sh  | 1 -
 tools/appliance/definitions/systemvmtemplate/finalize.sh | 5 +++--
 tools/appliance/definitions/systemvmtemplate/zerodisk.sh | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
index 4f5fccf..99ee5b5 100644
--- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh
+++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
@@ -45,7 +45,6 @@ function cleanup_dev() {
 
 function cleanup_misc() {
   # Scripts
-  rm -fv /home/cloud/*.sh
   rm -fr /home/cloud/cloud_scripts*
   rm -f /root/.rnd
   rm -f /var/www/html/index.html
diff --git a/tools/appliance/definitions/systemvmtemplate/finalize.sh b/tools/appliance/definitions/systemvmtemplate/finalize.sh
index 10cb048..d8b2bb5 100644
--- a/tools/appliance/definitions/systemvmtemplate/finalize.sh
+++ b/tools/appliance/definitions/systemvmtemplate/finalize.sh
@@ -19,7 +19,8 @@
 set -e
 set -x
 
-function randomize_password() {
+function configure_misc() {
+  rm -fv /home/cloud/*.sh
   echo "cloud:`openssl rand -base64 32`" | chpasswd
 }
 
@@ -39,7 +40,7 @@ END
 }
 
 function finalize() {
-  randomize_password
+  configure_misc
   configure_sudoers
   sync
   halt -p
diff --git a/tools/appliance/definitions/systemvmtemplate/zerodisk.sh b/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
index 0b72363..544bfa8 100644
--- a/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
+++ b/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
@@ -24,7 +24,8 @@ function cleanup_veewee() {
   # this has to be here since it is the last file to run (and we remove ourselves)
   cd /home/cloud
   rm -fv *.iso
-  rm -fv *.sh
+  rm -fv {apt_upgrade,authorized_keys,cleanup,install_systemvm_packages,zerodisk}.sh
+  rm -fv configure_{acpid,conntrack,grub,locale,networking,persistent_config,systemvm_services}.sh /home/cloud/install_systemvm_packages.sh
   rm -fv .veewee_version .veewee_params .vbox_version
   df -h
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].