From 908c9c67eab553877bc5d16e2d52318d1d8ce8f9 Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 23 Nov 2012 16:07:41 +0000 Subject: Import patches-unapplied version 1.1-0ubuntu2 to ubuntu/raring-proposed Imported using git-ubuntu import. Changelog parent: 49a663c4bc1499f974cca254a9c13016c4382a1b New changelog entries: * Stop upgrades purging walinuxagent meta-data and configuration files (LP: #1079897): - d/{control,walinuxagent-data-saver.preinst}: Added walinuxagent-data-saver package to ensure that agent generated data is not lost on upgrade by diverting /usr/sbin/waagent during the upgrade process. - d/walinuxagent-data-saver.lintian-overrides: Override errors about use of dpkg-divert in this package. - d/control: Added Pre-Depends to walinuxagent on walinuxagent-data-saver. - d/prerm: Stop calling waagent --uninstall during reconfiguration and upgrade, specify files to remove manually for purge. - d/postinst: Remove divert of /usr/sbin/waagent prior to completion of package install. * d/preinst: If upgrading from package version with unmanaged waagent upstart configuration stop the agent and remove the upstart configuration. * d/upstart: Tidied description in upstart job. --- debian/prerm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian/prerm') diff --git a/debian/prerm b/debian/prerm index 22c87b2..54d4caa 100644 --- a/debian/prerm +++ b/debian/prerm @@ -3,12 +3,11 @@ set -e case "$1" in purge) rm /etc/waagent.conf > /dev/null || true + rm -rf /var/lib/waagent > /dev/null || true + rm /etc/ssh/*waagent > /dev/null || true ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - if [ -x /usr/sbin/waagent ]; then - waagent --uninstall - fi ;; *) -- cgit v1.2.3