[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-1-1-g8df5608

[Luca Capello]

The following commit has been merged in the master branch:
commit 8df560896499e8d8714708bce558c0e92a1a926c
Author: Luca Capello <luca at pca.it>
Date:   Thu Jun 14 14:33:47 2012 +0200

    debian/*.init: check if the daemon is executable

diff --git a/debian/bacula-director-common.bacula-director.init b/debian/bacula-director-common.bacula-director.init
index 6c44117..a1ea6a9 100644
--- a/debian/bacula-director-common.bacula-director.init
+++ b/debian/bacula-director-common.bacula-director.init
@@ -28,7 +28,7 @@ NAME="bacula-dir"
 PORT=9101
 DESC="Bacula Director"
 
-if [ ! -f $DAEMON ] ; then
+if [ ! -x $DAEMON ] ; then
 	echo "No bacula-director SQL package installed"
 	exit 0
 fi
diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index 06c7bcd..731eac0 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -30,7 +30,7 @@ NAME="bacula-fd"
 PORT=9102
 DESC="Bacula File daemon"
 
-test -f $DAEMON || exit 0
+test -x $DAEMON || exit 0
 
 if [ -n "`getent services bacula-fd`" ]; then
 	PORT=`getent services bacula-fd | awk '{ gsub("/tcp","",$2); print $2; }'`
diff --git a/debian/bacula-sd.init b/debian/bacula-sd.init
index cd3058b..f08d037 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -28,7 +28,7 @@ NAME="bacula-sd"
 PORT=9103
 DESC="Bacula Storage daemon"
 
-test -f $DAEMON || exit 0
+test -x $DAEMON || exit 0
 
 if [ -n "`getent services bacula-sd`" ]; then
         PORT=`getent services bacula-sd | awk '{ gsub("/tcp","",$2); print $2; }'`
diff --git a/debian/changelog b/debian/changelog
index e0ac119..67eb78b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bacula (5.2.6+dfsg-2) UNRELEASED; urgency=low
+
+  * debian/bacula-*.init:
+    + check if the daemon is executable.
+
+ --
+
 bacula (5.2.6+dfsg-1) unstable; urgency=high
 
   [ Alexander Golovko ]

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