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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 0527cba52b28f735cde6b1e499da93991860e37e
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Mon Aug 6 12:13:37 2012 +0400

    switch from usermod to adduser

diff --git a/debian/bacula-common.preinst b/debian/bacula-common.preinst
index bf1da3a..644159f 100644
--- a/debian/bacula-common.preinst
+++ b/debian/bacula-common.preinst
@@ -7,16 +7,16 @@ case "$1" in
 	install)
 		if ! getent passwd bacula >/dev/null; then
 			echo -n "Adding user 'bacula'... "
-			adduser --system --home /var/lib/bacula --no-create-home --group bacula 2>&1 > /dev/null
-			usermod -c "Bacula" bacula
-			usermod -G tape,cdrom bacula
+			adduser --system --home /var/lib/bacula --gecos Bacula --no-create-home --group bacula 2>&1 >/dev/null
+			adduser bacula tape 2>&1 >/dev/null
+			adduser bacula cdrom 2>&1 >/dev/null
 			echo "Ok."
 		fi
 	;;
 
 	upgrade)
 		if dpkg --compare-versions "$2" lt "5.2.6+dfsg-3"; then
-			usermod -a -G cdrom bacula
+			adduser bacula cdrom 2>&1 >/dev/null
 		fi
 
                # Before 1.38.9-2, logs were in the wrong place.  Fix.
diff --git a/debian/changelog b/debian/changelog
index 1b8a19d..dd5fe3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ bacula (5.2.6+dfsg-3) unstable; urgency=high
     + fix files left after bacula-console package purge (Closes: #682733).
   * debian/bacula-console-qt.postrm, debian/bacula-traymonitor.postrm:
     + fix files left after packages purge (thanks to piuparts).
+  * debian/bacula-common.preinst:
+    + switch from usermod to more debian-policy friendly adduser.
 
   [ Bart Swedrowski ]
   * debian/bacula-console.postinst:

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