From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sat, 17 Jan 2009 12:54:09 +0000 (+0000)
Subject: Use invoke-rc.d instead of accessing /etc/init.d directly.  Lintian again.
X-Git-Tag: 4.3~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/cd94baeeaed0e720e39e8a891a5ee91a03cb9692?ds=sidebyside

Use invoke-rc.d instead of accessing /etc/init.d directly.  Lintian again.
---

diff --git a/debian/postinst.disorder-server b/debian/postinst.disorder-server
index 2d65cc7..cb5e60d 100755
--- a/debian/postinst.disorder-server
+++ b/debian/postinst.disorder-server
@@ -34,7 +34,7 @@ configure_init_d() {
 }
 
 restart_server() {
-  /etc/init.d/disorder restart
+  invoke-rc.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
@@ -166,10 +166,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
 
diff --git a/debian/prerm.disorder-server b/debian/prerm.disorder-server
index 19af4cb..93b7e23 100755
--- a/debian/prerm.disorder-server
+++ b/debian/prerm.disorder-server
@@ -16,10 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-set -
+set -e
 case "$1" in
 upgrade )
-  /etc/init.d/disorder stop
+  invoke-rc.d disorder stop
   ;;
 failed-upgrade )
   # Upgrading from 2.0 to 3.0.x can provoke this problem.  The 2.0