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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 4a4b5a8554f523c89da9608a874ddb6e8bb1dd5e
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sun Jul 8 13:02:37 2012 +0400

    switch to /run directory

diff --git a/debian/additions/common-functions.init b/debian/additions/common-functions.init
index f2b7f00..367e4af 100644
--- a/debian/additions/common-functions.init
+++ b/debian/additions/common-functions.init
@@ -4,8 +4,8 @@
 
 create_var_run_dir()
 {
-	if [ ! -d /var/run/bacula/ ]; then
-		mkdir -p -m 0755 /var/run/bacula/
-		chown bacula:daemon /var/run/bacula/
+	if [ ! -d /run/bacula/ ]; then
+		mkdir -p -m 0755 /run/bacula/
+		chown bacula:daemon /run/bacula/
 	fi
 }
diff --git a/debian/bacula-common.postrm b/debian/bacula-common.postrm
index 379a016..ee6341f 100644
--- a/debian/bacula-common.postrm
+++ b/debian/bacula-common.postrm
@@ -5,7 +5,7 @@ set -e
 
 case "$1" in
 	purge)
-		rm -rf /var/run/bacula
+		rm -rf /run/bacula
 		rm -rf /etc/bacula
 		rm -rf /var/log/bacula
 		rm -rf /var/lib/bacula
diff --git a/debian/bacula-director-common.bacula-director.init b/debian/bacula-director-common.bacula-director.init
index d1313e0..22ffcf6 100644
--- a/debian/bacula-director-common.bacula-director.init
+++ b/debian/bacula-director-common.bacula-director.init
@@ -38,7 +38,7 @@ if [ -n "`getent services bacula-dir`" ]; then
 fi
  
 
-PIDFILE=/var/run/bacula/$NAME.$PORT.pid
+PIDFILE=/run/bacula/$NAME.$PORT.pid
 
 . /lib/lsb/init-functions
 . /usr/share/bacula-common/common-functions.init
@@ -108,7 +108,6 @@ case "$1" in
 		exit 0
 	fi
 
-	create_var_run_dir
 	log_daemon_msg "Starting $DESC..." "$NAME"
         if do_start ; then
                 log_end_msg 0
diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index cfcda62..da31862 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -49,7 +49,7 @@ ARGS="${ARGS:-}"
 create_var_run_dir
 
 
-PIDFILE=/var/run/bacula/$NAME.$PORT.pid
+PIDFILE=/run/bacula/$NAME.$PORT.pid
 
 do_start()
 {
diff --git a/debian/bacula-sd.init b/debian/bacula-sd.init
index 9010f3f..6e8102b 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -46,7 +46,7 @@ ARGS="${ARGS:-}"
 
 create_var_run_dir
 
-PIDFILE=/var/run/bacula/$NAME.$PORT.pid
+PIDFILE=/run/bacula/$NAME.$PORT.pid
 
 do_start()
 {
diff --git a/debian/changelog b/debian/changelog
index 64bee25..c1b9d29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,10 @@ bacula (5.2.6+dfsg-3) unstable; urgency=high
   [ Alexander Golovko ]
   * debian/rules:
     + fix daemons user/group on systems with systemd (Closes: #679958).
-    + fix pid directory on systems with systemd.
+  * debian/rules, debian/*.init, debian/bacula-common.postrm,
+    debian/additions/common-functions.init:
+    + switch to /run directory (/var/run/bacula -> /run/bacula,
+      /var/lock -> /run/lock).
   * debian/patches/remove-use-statement-for-mysql (Closes: #679855):
     + fix impossibility to run out-of-box scritps make_mysql_tables and
       update_mysql_tables scripts, shipped with package.
diff --git a/debian/rules b/debian/rules
index 6d144b9..ee2296a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ CONF_ALL	= \
 	--with-pid-dir=/run/bacula \
 	--with-smtp-host=localhost \
 	--with-working-dir=/var/lib/bacula \
-	--with-subsys-dir=/var/lock \
+	--with-subsys-dir=/run/lock \
 	--with-dump-email=root \
 	--with-job-email=root \
 	--with-systemd=/lib/systemd/system

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