[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-71-gbbe3dd6

[Alexander Golovko]

The following commit has been merged in the master branch:
commit c83e103137ce0c2e6dcf33ef76445d9e7435be76
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Tue May 22 23:58:45 2012 +0400

    allow dh_installinit add services stop/start
    
    remove from scripts any manual service stop/start
    dh_installinit can do this not worse

diff --git a/debian/bacula-director-mysql.postinst b/debian/bacula-director-mysql.postinst
index 7b99b2a..a3b0a86 100644
--- a/debian/bacula-director-mysql.postinst
+++ b/debian/bacula-director-mysql.postinst
@@ -40,10 +40,6 @@ POSTINST_COMMON="/usr/share/bacula-director/postinst-common"
 DEFCONFIG="/usr/share/bacula-common/defconfig"
 CFGFILE="/etc/bacula/bacula-dir.conf"
 
-if [ -n "$2" ]; then
-	/etc/init.d/bacula-director stop || true
-	sleep 1
-fi
 
 . /usr/share/bacula-common/common-functions.dpkg
 readOrCreatePasswords
@@ -83,7 +79,6 @@ esac
 # Do start daemon
 db_stop
 
-invoke-rc.d --quiet bacula-director start
 
 #DEBHELPER#
 
diff --git a/debian/bacula-director-mysql.prerm b/debian/bacula-director-mysql.prerm
index 87638b1..454080d 100644
--- a/debian/bacula-director-mysql.prerm
+++ b/debian/bacula-director-mysql.prerm
@@ -32,7 +32,6 @@ set -e
 
 case "$1" in
     remove|deconfigure)
-		/usr/sbin/invoke-rc.d bacula-director stop
         ;;
     upgrade)
 	;;
diff --git a/debian/bacula-director-pgsql.postinst b/debian/bacula-director-pgsql.postinst
index 6224508..66acf85 100644
--- a/debian/bacula-director-pgsql.postinst
+++ b/debian/bacula-director-pgsql.postinst
@@ -46,10 +46,6 @@ PGSQL=/usr/bin/psql
 GRANT_SQL_PRIVS="/usr/share/bacula-director/grant_pgsql_privileges"
 AUTHFILE=`getent passwd bacula | cut -d ':' -f 6`/.pgpass
 
-if [ -n "$2" ]; then
-	/etc/init.d/bacula-director stop || true
-	sleep 1
-fi
 
 . /usr/share/bacula-common/common-functions.dpkg
 readOrCreatePasswords
@@ -93,7 +89,6 @@ esac
 # Do start daemon
 db_stop
 
-invoke-rc.d --quiet bacula-director start
 
 #DEBHELPER#
 
diff --git a/debian/bacula-director-pgsql.prerm b/debian/bacula-director-pgsql.prerm
index 9d8a2e7..d46ef4c 100644
--- a/debian/bacula-director-pgsql.prerm
+++ b/debian/bacula-director-pgsql.prerm
@@ -31,7 +31,6 @@ fi
 
 case "$1" in
     remove|deconfigure)
-		/usr/sbin/invoke-rc.d bacula-director stop
         ;;
     upgrade)
 	;;
diff --git a/debian/bacula-director-sqlite3.postinst b/debian/bacula-director-sqlite3.postinst
index a42d44e..00520d1 100644
--- a/debian/bacula-director-sqlite3.postinst
+++ b/debian/bacula-director-sqlite3.postinst
@@ -31,11 +31,6 @@ dbc_dbfile_owner=bacula:bacula
 # set in config, must not be set here: dbc_dbname=bacula.db
 # set in config, must not be set here: dbc_basepath=/var/lib/bacula
 
-if [ -n "$2" ]; then
-	/etc/init.d/bacula-director stop || true
-	sleep 1
-fi
-
 
 # source dbconfig-common shell library, and call the hook function
 if [ -f /usr/share/dbconfig-common/dpkg/config.sqlite3 ]; then
@@ -89,7 +84,6 @@ esac
 # Do start daemon
 db_stop
 
-invoke-rc.d --quiet bacula-director start
 
 #DEBHELPER#
 
diff --git a/debian/bacula-director-sqlite3.prerm b/debian/bacula-director-sqlite3.prerm
index e5e895b..bb97c89 100644
--- a/debian/bacula-director-sqlite3.prerm
+++ b/debian/bacula-director-sqlite3.prerm
@@ -19,7 +19,6 @@ set -e
 
 case "$1" in
     remove|deconfigure)
-		/usr/sbin/invoke-rc.d bacula-director stop
 	;;
     upgrade)
 	;;
diff --git a/debian/rules b/debian/rules
index d992b7c..0ec0979 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,9 +106,9 @@ override_dh_shlibdeps:
 override_dh_installinit:
 	dh_installinit -pbacula-sd -- defaults 90 10
 	dh_installinit -pbacula-fd -- defaults 91 9
-	dh_installinit --name=bacula-director -pbacula-director-pgsql --no-start -- defaults 92 8
-	dh_installinit --name=bacula-director -pbacula-director-mysql --no-start -- defaults 92 8
-	dh_installinit --name=bacula-director -pbacula-director-sqlite3 --no-start -- defaults 92 8
+	dh_installinit -pbacula-director-pgsql --name=bacula-director -- defaults 92 8
+	dh_installinit -pbacula-director-mysql --name=bacula-director -- defaults 92 8
+	dh_installinit -pbacula-director-sqlite3 --name=bacula-director -- defaults 92 8
 
 override_dh_install:
 	chmod 755 debian/additions/postinst-common

-- 
Bacula, a network backup, recovery and verification program