aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-06-17 03:47:29 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-06-20 13:35:25 +0000
commit94e0b0631f3760e6ba47edf9dbb2637a575a8019 (patch)
tree5a4b1ecfaec69a04410ffc77cb49cd346c3b8f34 /testing
parentbf39fb1177ee77eee6c214a7393cc0054958ce08 (diff)
downloadaports-94e0b0631f3760e6ba47edf9dbb2637a575a8019.tar.gz
aports-94e0b0631f3760e6ba47edf9dbb2637a575a8019.tar.bz2
aports-94e0b0631f3760e6ba47edf9dbb2637a575a8019.tar.xz
testing/[various]: Add group and use it as primary in .pre-* scripts.
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. Brings status quo regarding primary groups of users created in packages: - testing/buildbot - testing/buildbot-slave - testing/clapf It should have been part of commit a835b6916533, but was overlooked.
Diffstat (limited to 'testing')
-rw-r--r--testing/buildbot-slave/buildbot-slave.pre-install3
-rw-r--r--testing/buildbot/buildbot.pre-install3
-rw-r--r--testing/clapf/clapf.pre-install3
3 files changed, 6 insertions, 3 deletions
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index 695f71607b..7a1deeded1 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
@@ -1,5 +1,6 @@
#!/bin/sh
-adduser -S -D -H -h /home/buildbot -s /sbin/nologin -g buildbot buildbot 2>/dev/null
+addgroup -S buildbot 2>/dev/null
+adduser -S -D -H -h /home/buildbot -s /sbin/nologin -G buildbot -g buildbot buildbot 2>/dev/null
exit 0
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index 695f71607b..7a1deeded1 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
@@ -1,5 +1,6 @@
#!/bin/sh
-adduser -S -D -H -h /home/buildbot -s /sbin/nologin -g buildbot buildbot 2>/dev/null
+addgroup -S buildbot 2>/dev/null
+adduser -S -D -H -h /home/buildbot -s /sbin/nologin -G buildbot -g buildbot buildbot 2>/dev/null
exit 0
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index 01c4585c92..7cbfaad04b 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -1,5 +1,6 @@
#!/bin/sh
-adduser -S -D -H -s /bin/false -g clamav clamav 2>/dev/null
+addgroup -S clamav 2>/dev/null
+adduser -S -D -H -s /bin/false -G clamav -g clamav clamav 2>/dev/null
exit 0