From 9a9ae38a98b5e00a1580ee89a534c36724b5ad34 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 11 Mar 2015 12:30:54 +0000
Subject: [PATCH] OPENDJ-1772: Avoid double server stop in debian package uninstall
---
opendj-server-legacy/resource/debian/control/prerm | 11 ++---------
opendj-server-legacy/resource/debian/control/postrm | 6 ++++--
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/resource/debian/control/postrm b/opendj-server-legacy/resource/debian/control/postrm
index 7144dda..2ae6337 100644
--- a/opendj-server-legacy/resource/debian/control/postrm
+++ b/opendj-server-legacy/resource/debian/control/postrm
@@ -29,8 +29,10 @@
# Post rm script
# Files are removed automatically by pm.
if [ "$1" = "remove" ] ; then
- echo
- echo *OpenDJ successfully removed
+ # Deletes the service.
+ update-rc.d -f opendj remove
+ echo
+ echo *OpenDJ successfully removed
fi
echo
# End of the post rm script
\ No newline at end of file
diff --git a/opendj-server-legacy/resource/debian/control/prerm b/opendj-server-legacy/resource/debian/control/prerm
index 3b329e9..4448773 100644
--- a/opendj-server-legacy/resource/debian/control/prerm
+++ b/opendj-server-legacy/resource/debian/control/prerm
@@ -27,18 +27,11 @@
set -e
# Pre rm script
-
-# Stops the service.
-/etc/init.d/opendj stop >/dev/null 2>&1
-
-# Deletes the service.
-update-rc.d -f opendj remove
-
# Unlink the symlink to the process ID if it exists.
test -h "/var/run/opendj.pid" && unlink /var/run/opendj.pid
+
# Stops the server if the instance has been configured
if [ "$1" = "remove" ] && ( [ -f ${deb.prefix}/config/buildinfo ] && [ "$(ls -A ${deb.prefix}/config/archived-configs)" ] ) ; then
- echo *Stopping OpenDJ server...
- ${deb.prefix}/bin/./stop-ds
+ ${deb.prefix}/bin/./stop-ds
fi
# End prem script
\ No newline at end of file
--
Gitblit v1.10.0