X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/e7eb3a2744aa45179daea235800753d3d1955338..dde24f58aaec900461e43e21e5e4597fa139d419:/debian/postinst.disorder-server

diff --git a/debian/postinst.disorder-server b/debian/postinst.disorder-server
index 2d65cc7..316f1e9 100755
--- a/debian/postinst.disorder-server
+++ b/debian/postinst.disorder-server
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # This file is part of DisOrder
-# Copyright (C) 2004, 2007, 2008 Richard Kettlewell
+# Copyright (C) 2004, 2007-2009 Richard Kettlewell
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,10 +34,31 @@ configure_init_d() {
 }
 
 restart_server() {
-  /etc/init.d/disorder restart
-  # Wait for the server to get going.  This is a horrid bodge and ought
-  # to be done away with, but is required for the time being.  Sorry.
-  sleep 5
+  local first
+  local time
+  invoke-rc.d disorder restart
+  # Wait for the server to start
+  first=true
+  time=0
+  while :; do
+    if disorder version >/dev/null 2>&1; then
+      break
+    else
+      if [ $time -gt 30 ]; then
+        echo
+        echo "Server did not stabilise in a reasonable amount of time"
+        exit 1
+      fi
+      if $first; then
+	printf "Waiting for server to stabilise"
+	first=false
+      fi
+      printf "."
+      sleep 1
+    fi
+    time=`expr $time + 1`
+  done
+  echo
 }
 
 setup_guest() {
@@ -166,10 +187,10 @@ reconfigure )
   create_config
   ;;
 abort-upgrade )
-  /etc/init.d/disorder restart
+  invoke-rc.d disorder restart
   ;;
 reconfigure )
-  /etc/init.d/disorder reload
+  invoke-rc.d disorder reload
   ;;
 esac