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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 230b330f6e72bc9241840cdd9e8325be0e466cd4
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Tue Jan 29 18:05:12 2013 +0400

    remove overlogic for /etc/defaults/*

diff --git a/debian/additions/common-functions.dpkg b/debian/additions/common-functions.dpkg
index 353ec23..137f33a 100644
--- a/debian/additions/common-functions.dpkg
+++ b/debian/additions/common-functions.dpkg
@@ -162,17 +162,14 @@ setup_etc_default() {
         bacula-fd)
             SERVICE="bacula-fd"
             ARGS=""
-            DEFAULT_ARGS=""
             ;;
         bacula-sd)
             SERVICE="bacula-sd"
             ARGS="-u bacula -g tape"
-            DEFAULT_ARGS="-u bacula -g tape"
             ;;
         bacula-director-pgsql|bacula-director-mysql|bacula-director-sqlite3)
             SERVICE="bacula-dir"
             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"
@@ -198,7 +195,6 @@ setup_etc_default() {
         else
             if [ -f "$DEFAULTS" ]; then
                 ENABLED=$(. $DEFAULTS; echo $ENABLED)
-                ARGS=$(. $DEFAULTS; echo $ARGS)
                 CONFIG=$(. $DEFAULTS; echo $CONFIG)
             fi
         fi
@@ -220,7 +216,7 @@ setup_etc_default() {
 ENABLED="$ENABLED"
 
 # Additional start arguments can be provided here
-# ARGS="$DEFAULT_ARGS"
+# ARGS="$ARGS"
 ARGS="$ARGS"
 
 # Default config file can be changed here
diff --git a/debian/changelog b/debian/changelog
index adbed54..4ba90a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 bacula (5.2.6+dfsg-8) unstable; urgency=high
 
   * debian/additions/common-functions.dpkg:
-    + Fix missed user for run bacula-director (Closes: # 699244).
+    + Fix missed user for run bacula-director (Closes: #699244).
 
- -- Alexander Golovko <alexandro at ankalagon.ru>  Tue, 29 Jan 2013 16:45:46 +0400
+ -- 
 
 bacula (5.2.6+dfsg-7) unstable; urgency=low
 

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