From 76fad343ac0b98429e62900b5c8524d4b100c8fe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Mon, 18 Dec 2006 21:04:59 +0000 Subject: [PATCH] * don't exit initscript before citadelserver is gone. --- citadel/buildpackages | 4 ++-- citadel/debian/citadel-server.postinst | 4 ++++ citadel/debian/citadel.init | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/citadel/buildpackages b/citadel/buildpackages index 7a9ac9b97..2a177af32 100755 --- a/citadel/buildpackages +++ b/citadel/buildpackages @@ -46,9 +46,9 @@ case $1 in else echo "citadel (${CITADEL_VERSION}-${PACKAGE_VERSION}) unstable; urgency=low - * update to actual Citadel CVS. many new features. see Packages changelog. + * update to actual Citadel SVN. many new features. see Packages changelog. - -- Wilfried Goesgens $DATE + -- Wilfried Goesgens $DATE " >/tmp/citadel_changelog cat debian/changelog >>/tmp/citadel_changelog diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst index 5f52f45e7..1cf746837 100644 --- a/citadel/debian/citadel-server.postinst +++ b/citadel/debian/citadel-server.postinst @@ -189,6 +189,10 @@ case "$1" in /usr/sbin/sendcommand "DOWN" fi + while test -S /var/run/citadel/citadel.socket; do + sleep 1 + done + update-rc.d citadel defaults >/dev/null echo "run /etc/init.d/citadel start to start citadel service." diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init index 1d0d8b385..acaf6f25a 100644 --- a/citadel/debian/citadel.init +++ b/citadel/debian/citadel.init @@ -79,7 +79,12 @@ do_stop() # other if a failure occurred if $SENDCOMMAND "DOWN" >/dev/null 2>&1 ; then rm -f $PIDFILE - return 0 + + while test -S /var/run/citadel/citadel.socket; do + sleep 1 + echo -n "." + done + return 0 else rm -f $PIDFILE return 2 -- 2.39.2