CLOUDSTACK-7143: cleanup cleanup.sh code
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ed531675 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ed531675 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ed531675 Branch: refs/heads/master Commit: ed5316754761f3dc70c1487fc9ce4074c62c7090 Parents: 3c9f2c7 Author: Leo Simons <lsim...@schubergphilis.com> Authored: Mon Jul 21 11:21:03 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Mon Sep 22 21:31:36 2014 +0200 ---------------------------------------------------------------------- .../definitions/systemvmtemplate/cleanup.sh | 41 ++++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed531675/tools/appliance/definitions/systemvmtemplate/cleanup.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh b/tools/appliance/definitions/systemvmtemplate/cleanup.sh index 3b1d4bf..af3a169 100644 --- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh +++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh @@ -1,16 +1,33 @@ -# Clean up -#apt-get -y remove linux-headers-$(uname -r) build-essential -apt-get -y remove dictionaries-common busybox -apt-get -y autoremove -apt-get autoclean -apt-get clean +#!/bin/bash + +set -e +set -x + +function cleanup_apt() { + #apt-get -y remove linux-headers-$(uname -r) build-essential + apt-get -y remove dictionaries-common busybox + apt-get -y autoremove + apt-get autoclean + apt-get clean +} # Removing leftover leases and persistent rules -echo "cleaning up dhcp leases" -rm /var/lib/dhcp/* +function cleanup_dhcp() { + rm -f /var/lib/dhcp/* +} # Make sure Udev doesn't block our network -echo "cleaning up udev rules" -rm /etc/udev/rules.d/70-persistent-net.rules -rm -rf /dev/.udev/ -rm /lib/udev/rules.d/75-persistent-net-generator.rules +function cleanup_dev() { + echo "cleaning up udev rules" + rm -f /etc/udev/rules.d/70-persistent-net.rules + rm -rf /dev/.udev/ + rm -f /lib/udev/rules.d/75-persistent-net-generator.rules +} + +function cleanup() { + cleanup_apt + cleanup_dhcp + cleanup_dev +} + +return 2>/dev/null || cleanup
