aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-06-06 02:05:05 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-06-20 17:17:17 +0200
commit9d5866018cdea10073fbbb2b77c54f0f0f92f58d (patch)
tree017305fec939b67bba0f3c91eb8b19aaa7449456
parente1d01b0981f92050eec9f3235ec058e9fd143899 (diff)
downloadaports-9d5866018cdea10073fbbb2b77c54f0f0f92f58d.tar.bz2
aports-9d5866018cdea10073fbbb2b77c54f0f0f92f58d.tar.xz
main/{npre, postgrey}: Properly set primary group in .pre-install.
Fixes the problem I unintentionally brought in commit ccc056dbf9d3: system user creation doesn't add same named group and uses nogroup as primary group unless explicitly specified via -G. (cherry picked from commit 3c1fa46624bd65849ace1212d16be85eea865699)
-rw-r--r--main/nrpe/nrpe.pre-install2
-rw-r--r--main/postgrey/postgrey.pre-install2
2 files changed, 2 insertions, 2 deletions
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index 875a9fadce..0b519f5f4e 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -S -D -H -h /dev/null -s /sbin/nologin -g nagios nagios 2>/dev/null
addgroup -S nagios 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G nagios -g nagios nagios 2>/dev/null
exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index 5f1d560e15..bb4269656d 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S postgrey 2>/dev/null
-adduser -S -D -H -h /dev/null -s /sbin/nologin -g postgrey postgrey 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G postgrey -g postgrey postgrey 2>/dev/null
exit 0