summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpetere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb>2011-12-06 18:16:56 +0000
committerpetere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb>2011-12-06 18:16:56 +0000
commit37adf43fedc24675bcaffb04dcb7171d2630ca7e (patch)
treed83561e1c2caec28febca582b5fea9d39d3ad2ef
parentbfaeb79874344c047e2ece98ce991797eb31254a (diff)
downloadntp-37adf43fedc24675bcaffb04dcb7171d2630ca7e.tar.gz
* Create ntp user and group separately, to handle the case where the
user already exists but not the group (closes: #624275) * Don't ignore errors from adduser. If the system user or group already exist, this is ignored anyway. Anything else we want to know about. git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@349 0070b5ef-2f16-0410-befa-9a02bd1d6ddb
-rw-r--r--debian/changelog6
-rw-r--r--debian/ntp.postinst3
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index d4028d1..7d460c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,12 @@ ntp (1:4.2.6.p3+dfsg-2) UNRELEASED; urgency=low
* Update options list on ntptrace man page to match reality (closes:
#593417)
* Add build-arch and build-indep debian/rules targets, per lintian
+ * Create ntp user and group separately, to handle the case where the
+ user already exists but not the group (closes: #624275)
+ * Don't ignore errors from adduser. If the system user or group already
+ exist, this is ignored anyway. Anything else we want to know about.
- -- Peter Eisentraut <petere@debian.org> Tue, 06 Dec 2011 01:00:02 +0200
+ -- Peter Eisentraut <petere@debian.org> Tue, 06 Dec 2011 19:57:43 +0200
ntp (1:4.2.6.p3+dfsg-1) unstable; urgency=low
diff --git a/debian/ntp.postinst b/debian/ntp.postinst
index cfe8c62..3e46351 100644
--- a/debian/ntp.postinst
+++ b/debian/ntp.postinst
@@ -19,7 +19,8 @@ if dpkg-maintscript-helper supports mv_conffile; then
fi
if [ "$1" = "configure" ]; then
- adduser --system --quiet --group --no-create-home ntp || :
+ addgroup --system --quiet ntp
+ adduser --system --quiet --ingroup ntp --no-create-home ntp
chown -R ntp:ntp /var/lib/ntp /var/log/ntpstats
fi