Merge lp:~mark-mims/ubuntu/precise/ganglia/useradd into lp:ubuntu/precise/ganglia

[Mark Mims]

Fix useradd options, Closes #854866

[Mark Mims (mark-mims)]

Not sure what needs to be done process-wise for oneiric, but lp:~mark-mims/ubuntu/oneiric/ganglia/useradd is identical to this branch.

[Scott Moser (smoser)]

Mark,
  I merged this in and uploaded to precise.
  There were a couple things that I fixed:
   * the new version should be '3.1.7-2ubuntu1', not '3.1.7-3' as it is an ubuntu package now.
   * the release should either be 'UNRELEASED' or 'precise' (not 'unstable')
   * in order to upload a package with diff from debian, you have to have a Maintainer in debian/control that has an ubuntu.com email address. Ie 'Ubuntu Developers <email address hidden>'.

   Note, you can use 'dch -i' to edit a debian/changelog and it will do some of that for you.

   With regard to oneiric, we can SRU that. You should follow the steps in https://wiki.ubuntu.com/StableReleaseUpdates . it takes some process, but the first step of that process is to get it into the development version.

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-07 21:26:32 +0000
+++ debian/changelog	2011-12-12 19:59:26 +0000
@@ -1,3 +1,9 @@
+ganglia (3.1.7-3) unstable; urgency=low
+
+  * Fix options on useradd in postinst. Closes: #854866
+
+ -- Mark Mims <[e-mail]>  Mon, 12 Dec 2011 13:44:39 -0600
+
 ganglia (3.1.7-2) unstable; urgency=low
   
   * Stop ganglia-monitor from changing permissions on /var/lib/ganglia

=== modified file 'debian/ganglia-monitor.postinst'
--- debian/ganglia-monitor.postinst	2011-04-07 21:26:32 +0000
+++ debian/ganglia-monitor.postinst	2011-12-12 19:59:26 +0000
@@ -1,18 +1,9 @@
 #!/bin/sh
 set -e
 
-if ! getent group ganglia >/dev/null; then
-	echo Adding group: ganglia.
-	groupadd --system ganglia
-fi
-
 if ! getent passwd ganglia >/dev/null; then
 	echo Adding system user: ganglia.
-	useradd --system ganglia 
-	usermod -c "Ganglia Monitor" 	ganglia
-	usermod -d "/var/lib/ganglia" 	ganglia
-	usermod -g "ganglia" 		ganglia
-	usermod -s "/bin/false" 	ganglia
+	useradd -r -c "Ganglia Monitor" -d "/var/lib/ganglia" -s "/bin/false" -U ganglia
 fi
 
 #if we have an old 2.5.x gmond

=== modified file 'debian/gmetad.postinst'
--- debian/gmetad.postinst	2011-04-07 21:26:32 +0000
+++ debian/gmetad.postinst	2011-12-12 19:59:26 +0000
@@ -1,18 +1,9 @@
 #!/bin/sh
 set -e
 
-if ! getent group ganglia >/dev/null; then
-	echo Adding group: ganglia.
-	groupadd --system ganglia
-fi
-
 if ! getent passwd ganglia >/dev/null; then
 	echo Adding system user: ganglia.
-	useradd --system ganglia 
-	usermod -c "Ganglia Monitor" 	ganglia
-	usermod -d "/var/lib/ganglia" 	ganglia
-	usermod -g "ganglia" 		ganglia
-	usermod -s "/bin/false" 	ganglia
+	useradd -r -c "Ganglia Monitor" -d "/var/lib/ganglia" -s "/bin/false" -U ganglia
 fi
 
 if [ ! -d /var/lib/ganglia/rrds ]; then