diff options
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-06-06 02:05:11 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-06-07 07:20:09 +0000
commit5708404c50a7e1bb8839c934e6ed29aa71dee873 (patch)
parenta7d67c695ca2750e7088ca33cc365281c353af18 (diff)
community/[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: - community/caddy - community/domoticz - community/oscam - community/syncthing
4 files changed, 8 insertions, 4 deletions
diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index ccb4f07f8f..08302882ed 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,6 +1,7 @@
-adduser -S -D -h /var/lib/caddy -s /sbin/nologin -g caddy caddy 2>/dev/null
+addgroup -S caddy 2>/dev/null
+adduser -S -D -h /var/lib/caddy -s /sbin/nologin -G caddy -g caddy caddy 2>/dev/null
adduser caddy www-data 2>/dev/null
exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 227206764f..6be1d39ab8 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,5 +1,6 @@
-adduser -S -D -h /var/lib/domoticz -s /sbin/nologin -g domoticz domoticz 2>/dev/null
+addgroup -S domoticz 2>/dev/null
+adduser -S -D -h /var/lib/domoticz -s /sbin/nologin -G domoticz -g domoticz domoticz 2>/dev/null
exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index a9982c724b..cce6bcd5b9 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,6 +1,7 @@
-adduser -S -D -H -s /sbin/nologin -g oscam oscam 2>/dev/null
+addgroup -S oscam 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G oscam -g oscam oscam 2>/dev/null
addgroup oscam usb 2>/dev/null
exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index a2ee46c831..685d7ed629 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,5 +1,6 @@
-adduser -S -D -H -h /var/lib/syncthing -s /sbin/nologin -g syncthing syncthing 2>/dev/null
+addgroup -S syncthing 2>/dev/null
+adduser -S -D -H -h /var/lib/syncthing -s /sbin/nologin -G syncthing -g syncthing syncthing 2>/dev/null
exit 0