From def6578c9e01e2ec5ff7830807100bbfef6dd0f2 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Thu, 1 Dec 2005 19:20:36 +0000
Subject: [PATCH] packaging cleaned up

---
 DEBIAN/postinst                  | 8 +++-----
 DEBIAN/prerm                     | 4 +++-
 cbox-tree.d/etc/init.d/cryptobox | 9 +++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/DEBIAN/postinst b/DEBIAN/postinst
index a29d170..8c9e16a 100755
--- a/DEBIAN/postinst
+++ b/DEBIAN/postinst
@@ -3,8 +3,6 @@
 # add the cryptobox startup script to /etc/rc?.d
 update-rc.d cryptobox defaults 98
 
-# start it
-if invoke-rc.d cryptobox status
-	then	invoke-rc.d cryptobox restart
-	else	invoke-rc.d cryptobox start
-  fi
+invoke-rc.d cryptobox restart
+
+true
diff --git a/DEBIAN/prerm b/DEBIAN/prerm
index e31f8bd..1774538 100755
--- a/DEBIAN/prerm
+++ b/DEBIAN/prerm
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-invoke-rc.d crpyotbox status && invoke-rc.d cryptobox stop
+invoke-rc.d cryptobox stop
+
+true
diff --git a/cbox-tree.d/etc/init.d/cryptobox b/cbox-tree.d/etc/init.d/cryptobox
index dde464b..48283b3 100755
--- a/cbox-tree.d/etc/init.d/cryptobox
+++ b/cbox-tree.d/etc/init.d/cryptobox
@@ -17,7 +17,7 @@ if [ "$NO_START" = "1" ]
 	then	[ $# -eq 0 ] && exit 0
 			[ "$1" = "status" ] && exit 1
 			[ "$1" = "stop" ] && exit 0
-			echo "CryptoBox is disabled"
+			echo "CryptoBox is disabled by default"
 			exit 0
   fi
 
@@ -52,7 +52,7 @@ case "$1" in
 			echo "	* point a webbrowser from another computer to 'http://$(/usr/lib/cryptobox/cbox-manage.sh get_current_ip)'"
 			echo "	* configure your CryptoBox via a webbrowser"
 			echo
-		else	
+		  else	
 			echo
 			echo "+---------------------------------------------------------------+"
 			echo "| WARNING: Some CryptoBox development features are enabled      |"
@@ -61,8 +61,9 @@ case "$1" in
 			echo "|  If you don't plan to refine this CD, don't use it!           |"
 			echo "+---------------------------------------------------------------+"
 			echo 
-			$DEV_FEATURES_SCRIPT "$@"
-		fi
+			"$DEV_FEATURES_SCRIPT" "$@"
+		  fi
+		true
 		;;
 	stop )
 		# exit if not running