* don't exit initscript before citadelserver is gone.

diff --git a/citadel/buildpackages b/citadel/buildpackages
index 7a9ac9b972a879b740747e710cbf9277be2c651f..2a177af321c4e762a1f7000e9d822c92bab5d88e 100755 (executable)
--- 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 <w.goesgens@chaosindustries.de>  $DATE
+ -- Wilfried Goesgens <citadel@outgesourced.org>  $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 5f52f45e717174046b1fbf01f0c94fb6be6a0544..1cf746837928987797723df17c906ecd2e308bc8 100644 (file)
--- 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 1d0d8b385185466e7d66bebb1f2d8c2cf119f245..acaf6f25a4eb7e32e95df68e0313b2ea69b43cfd 100644 (file)
--- 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