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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 9c4eadae644e16e96629108e500196f7cfcd97a4
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Tue Jan 29 16:47:00 2013 +0400

    fix missed user for run bacula-director
    
    Merging error in commit 453be1f06edbe8dd68381b156dbcbbd5681149b5.

diff --git a/debian/additions/common-functions.dpkg b/debian/additions/common-functions.dpkg
index fee5916..353ec23 100644
--- a/debian/additions/common-functions.dpkg
+++ b/debian/additions/common-functions.dpkg
@@ -171,7 +171,8 @@ setup_etc_default() {
             ;;
         bacula-director-pgsql|bacula-director-mysql|bacula-director-sqlite3)
             SERVICE="bacula-dir"
-            DAEMONUSER="bacula:bacula"
+            ARGS="-u bacula -g bacula"
+            DEFAULT_ARGS="-u bacula -g bacula"
             if ucfq -w "/etc/default/bacula-dir" \
                 |egrep -q '^[^:]*:bacula-director-(pgsql|mysql|sqlite3):'; then
                 UCFR_ARGS="-f"
diff --git a/debian/changelog b/debian/changelog
index 901069a..5ac135c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bacula (5.2.6+dfsg-8) unstable; urgency=high
+
+  * Fix missed user for run bacula-director
+
+ -- Alexander Golovko <alexandro at ankalagon.ru>  Tue, 29 Jan 2013 16:45:46 +0400
+
 bacula (5.2.6+dfsg-7) unstable; urgency=low
 
   * debian/bacula-sd.install, bacula-director-{sqlite3,mysql,pgsql}.install,

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