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 2013/02/27 12:38:04 UTC
[3/3] git commit: refs/heads/master - CLOUDSTACK-1340: During cleanup
deluser vagrant, sync after zero-ing the disk
Updated Branches:
refs/heads/master e2bd88b2a -> ff32ae530
CLOUDSTACK-1340: During cleanup deluser vagrant, sync after zero-ing the disk
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ff32ae53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ff32ae53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ff32ae53
Branch: refs/heads/master
Commit: ff32ae5305d0076ec7b21690f8fc5f6fe840f9aa
Parents: 23be2e7
Author: Rohit Yadav <bh...@apache.org>
Authored: Wed Feb 27 16:59:11 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Wed Feb 27 17:00:17 2013 +0530
----------------------------------------------------------------------
.../definitions/systemvmtemplate/cleanup.sh | 3 +++
.../definitions/systemvmtemplate/zerodisk.sh | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff32ae53/tools/appliance/definitions/systemvmtemplate/cleanup.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
index 6009aad..2dad612 100644
--- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh
+++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
@@ -17,3 +17,6 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules
echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
echo "pre-up sleep 2" >> /etc/network/interfaces
+
+# Remove the vagrant user
+deluser --group --force -remove-home vagrant
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff32ae53/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/zerodisk.sh b/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
index 9fc9f6f..0d105c2 100644
--- a/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
+++ b/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
@@ -3,5 +3,6 @@ rm -f /root/*
# Zero out the free space to save space in the final image:
dd if=/dev/zero of=/EMPTY bs=1M
+sync
rm -f /EMPTY