~alpine/aports

11 4

[alpine-aports] [PATCH 0/7] Pre-upgrade/pre-install addgroup/adduser cleanings

Przemyslaw Pawelczyk
Details
Message ID
<1461410021-29808-1-git-send-email-przemoc@zoho.com>
Sender timestamp
1461410014
DKIM signature
missing
Download raw message
This is a follow-up patch series to the alpine-devel ML thread titled:

    UID+GID inconsistency for installed services

Initially it was meant to only add -S option to scripts where group or
user is created, but it needed some preparatory actions and after
finally adding the options I couldn't resist temptation to slightly
reformat scripts, i.e. to make them more consistent and easier to update
(manually or automatically) in future.

Beside -S option (and additionally -g option in case of adduser) there
was no change in options provided to addgroup or adduser.  This patch
series was not intended to deeply review how groups/users are created in
each package, and whether options other than -S (and -g for adduser) are
lacking.  There are too many packages and package-specific knowledge is
required to do so properly.  Package maintainers are still encouraged to
give second thoughts on pre-install and pre-upgrade scripts to improve
them further, but such changes rather shouldn't be part of this set.

(I lied above, because there was one change in options provided to
adduser for squid package, which was required to fix wrong home dir.)

Please review these patches thoroughly to check for mistakes (unwanted
changes).  They touch a lot of files, so despite numerous self-reviews,
I could overlook something.

These patches do not bump pkgrel number, because they work on whole tree
and changes were splitted across these patches.  I also prepared patches
bumping pkgrel, but there are so many of them, that lead me to avoiding
sending them to alpine-aports ML, yet providing them via other means:

 http://paste.przemoc.net/alpine/20160423-addgroupuser-bump-pkgrel.mbox.gz

Patches from mbox bumping pkgrel have to be applied AFTER this patch
set.  All packages that had changes in scripts, even if insubstantial,
are covered by them.  If you don't want to bump pkgrel of unmaintained
packages, please ignore/drop last 4 patches from mbox.


Are pre-upgrade/pre-install scripts using addgroup/adduser fully
consistent after applying this patch series?

Surely not.  There are things like line-wrapping for instance that are
sometimes present and sometimes not, but I wanted to preserve some
original conventions seen in scripts and leave further refining them for
future.  It's kind of milestone and I had to stop at some point to not
delay this patch set any further, especially not beyond upcoming AL
3.4.0.  Sorry for disappointing those wishing for getting perfectly
consistent scripts in one go.


Przemyslaw Pawelczyk (7):
  Reorder options passed to addgroup in scripts: make -S first.
  Reorder options passed to adduser in scripts: make -S first.
  Add lacking -S option (system) to adduser/addgroup in scripts.
  Add -g option (GECOS/comment) to adduser in scripts.
  Improve consistency of scripts using adduser/addgroup.
  main/squid: Fix squid's home directory specification.
  Reorder arguments passed to addgroup/adduser in scripts.

 community/caddy/caddy.pre-install                         |  4 +++-
 community/davfs2/davfs2.pre-install                       |  5 ++---
 community/docker-registry/docker-registry.pre-install     |  3 ++-
 community/docker/docker.pre-install                       |  5 ++---
 community/domoticz/domoticz.pre-install                   |  4 +++-
 community/icinga2/icinga2.pre-install                     | 10 ++++++----
 community/minetest/minetest-server.pre-install            |  4 +++-
 community/oscam/oscam.pre-install                         |  4 +++-
 community/redmine/redmine.pre-install                     |  4 ++--
 community/seafile/seafile-server.pre-install              |  3 ++-
 community/smstools/smstools.pre-install                   |  8 +++++---
 community/sniproxy/sniproxy.pre-install                   |  4 +++-
 community/sword/sword.pre-install                         |  5 ++++-
 community/syncthing/syncthing.pre-install                 |  4 +++-
 community/tvheadend/tvheadend.pre-install                 |  4 +++-
 main/abuild/abuild.pre-install                            |  5 ++---
 main/alpine-baselayout/alpine-baselayout.pre-install      |  5 ++---
 main/alpine-baselayout/alpine-baselayout.pre-upgrade      |  6 +++---
 main/amavisd-new/amavisd-new.pre-install                  |  6 +++---
 main/apache2/apache2.pre-install                          |  6 ++++--
 main/apache2/apache2.pre-upgrade                          |  3 ++-
 main/aports-build/aports-build.pre-install                |  3 ++-
 main/arpwatch/arpwatch.pre-install                        |  5 +++--
 main/asterisk/asterisk.pre-install                        |  3 ++-
 main/asterisk/asterisk.pre-upgrade                        |  3 ++-
 main/atheme-iris/atheme-iris.pre-install                  |  5 +++--
 main/avahi/avahi.pre-install                              |  5 ++---
 main/backuppc/backuppc.pre-install                        |  6 ++++--
 main/bacula-client/bacula-client.pre-install              |  4 +++-
 main/bacula/bacula.pre-install                            |  4 +++-
 main/bind/bind.pre-install                                |  4 ++--
 main/charybdis/charybdis.pre-install                      |  4 +++-
 main/chrony/chrony.pre-install                            |  5 +++--
 main/clamav/clamav-daemon.pre-install                     |  3 ++-
 main/clamav/clamav-db.pre-install                         |  3 ++-
 main/clamav/freshclam.pre-install                         |  3 ++-
 main/clamsmtp/clamsmtp.pre-install                        |  3 ++-
 main/clamsmtp/clamsmtp.pre-upgrade                        |  3 ++-
 main/coova-chilli/coova-chilli.pre-install                |  5 +++--
 main/cups/cups.pre-install                                |  3 ++-
 main/cvechecker/cvechecker.pre-install                    |  7 +++++--
 main/dansguardian/dansguardian.pre-install                |  4 +++-
 main/darkhttpd/darkhttpd.pre-install                      |  6 +++---
 main/dbus/dbus.pre-install                                |  3 ++-
 main/dhcp/dhcp.pre-install                                |  4 ++--
 main/distcc/distcc.pre-install                            |  3 ++-
 main/djbdns/dnscache.pre-install                          |  4 ++--
 main/djbdns/tinydns.pre-install                           |  4 ++--
 main/dnsmasq/dnsmasq.pre-install                          |  5 +++--
 main/dovecot/dovecot.pre-install                          |  5 +++--
 main/ez-ipupdate/ez-ipupdate.pre-install                  |  4 ++--
 main/fetchmail/fetchmail.pre-install                      |  3 ++-
 main/freeradius/freeradius.pre-install                    |  6 +++---
 main/freeswitch/freeswitch.pre-install                    |  2 +-
 main/gdnsd/gdnsd.pre-install                              |  5 +++--
 main/gitolite/gitolite.pre-install                        |  4 +++-
 main/gnats/gnats.pre-install                              |  3 ++-
 main/gross/gross.pre-install                              |  4 +++-
 main/haproxy/haproxy.pre-install                          |  7 ++++---
 main/haproxy/haproxy.pre-upgrade                          |  7 ++++---
 main/icecast/icecast.pre-install                          |  2 +-
 main/ircservices/ircservices.pre-install                  |  4 ++--
 main/kamailio/kamailio.pre-install                        |  4 ++--
 main/libgphoto2/libgphoto2.pre-install                    |  5 ++---
 main/libvirt/libvirt.post-install                         |  4 +++-
 main/lighttpd/lighttpd.pre-install                        |  4 ++--
 main/logcheck/logcheck.pre-install                        |  5 +++--
 main/mariadb/mariadb.pre-install                          |  4 ++--
 main/memcached/memcached.pre-install                      |  4 ++--
 main/mini_httpd/mini_httpd.pre-install                    |  6 +++---
 main/minidlna/minidlna.pre-install                        |  5 +++--
 main/mlmmj/mlmmj.pre-install                              |  5 +++--
 main/mosquitto/mosquitto.pre-install                      |  3 ++-
 main/mpd/mpd.pre-install                                  |  4 +++-
 main/mumble/murmur.pre-install                            |  6 ++++--
 main/nagios/nagios.pre-install                            |  3 ++-
 main/nginx-initscripts/nginx-initscripts.pre-install      |  6 +++---
 main/nginx/nginx-common.pre-install                       |  2 +-
 main/ngircd/ngircd.pre-install                            |  3 ++-
 main/nrpe/nrpe.pre-install                                |  5 +++--
 main/nsd/nsd.pre-install                                  |  4 +++-
 main/nss-pam-ldapd/nss-pam-ldapd.pre-install              |  5 +++--
 main/ntop/ntop.pre-install                                |  4 +++-
 main/open-vm-tools/open-vm-tools.pre-install              |  5 +++--
 main/openldap/openldap.pre-install                        |  4 ++--
 main/openntpd/openntpd.pre-install                        |  2 +-
 main/opensmtpd/opensmtpd.pre-install                      |  6 ++----
 main/opentracker/opentracker.pre-install                  |  4 ++--
 main/openvpn/openvpn.pre-install                          |  3 ++-
 main/pcsc-lite/pcsc-lite.pre-install                      |  5 +++--
 main/pdnsd/pdnsd.pre-install                              |  3 ++-
 main/perdition/perdition.pre-install                      |  2 +-
 main/postfix/postfix.pre-install                          |  5 ++---
 main/postgrey/postgrey.pre-install                        |  4 ++--
 main/privoxy/privoxy.pre-install                          |  6 +++---
 main/qemu/qemu.pre-install                                |  4 +++-
 main/quagga-nhrp/quagga-nhrp.pre-install                  |  4 ++--
 main/quagga/quagga.pre-install                            |  4 ++--
 main/quassel/quassel-core.pre-install                     |  2 +-
 main/radvd/radvd.pre-install                              |  4 +++-
 main/redis/redis.pre-install                              |  5 +++--
 main/rpcbind/rpcbind.pre-install                          |  3 ++-
 main/rt4/rt4.pre-install                                  |  3 ++-
 main/rtnppd/rtnppd.pre-install                            |  3 ++-
 main/rtpproxy/rtpproxy.pre-install                        |  3 ++-
 main/samba/winbind.pre-install                            |  2 +-
 main/sems/sems.pre-install                                |  8 ++------
 main/sircbot/sircbot.pre-install                          |  5 +++--
 main/smokeping/smokeping.pre-install                      |  5 +++--
 main/snmptt/snmptt.pre-install                            |  4 +++-
 main/snort/snort.pre-install                              |  3 ++-
 main/squark/squark.post-install                           |  5 ++++-
 main/squid/squid.pre-install                              |  7 ++++---
 main/squid/squid.pre-upgrade                              |  7 ++++---
 main/strongswan/strongswan.pre-install                    |  8 ++------
 main/subversion/subversion.pre-install                    |  6 +++---
 main/tinyproxy/tinyproxy.pre-install                      |  2 +-
 main/trac/trac.pre-install                                |  5 +++--
 main/transmission/transmission-daemon.pre-install         |  2 +-
 main/umurmur/umurmur.post-install                         |  6 ++++--
 main/unbound/unbound.pre-install                          |  3 ++-
 main/uvncrepeater/uvncrepeater.pre-install                |  4 ++--
 main/varnish/varnish.pre-install                          |  3 ++-
 main/vde2/vde2.pre-install                                |  2 +-
 main/vlc/vlc-daemon.pre-install                           |  4 +++-
 main/vsftpd/vsftpd.pre-install                            |  8 +++++---
 main/ympd/ympd.pre-install                                |  4 +++-
 main/zabbix/zabbix-agent.pre-install                      |  6 +++---
 main/zabbix/zabbix.pre-install                            |  3 ++-
 main/znc/znc.pre-install                                  |  4 +++-
 testing/3proxy/3proxy.pre-install                         |  6 +++---
 testing/at/at.pre-install                                 | 15 +++------------
 testing/bitcoin/bitcoin.pre-install                       |  5 +++--
 testing/buildbot-slave/buildbot-slave.pre-install         |  5 +++--
 testing/buildbot/buildbot.pre-install                     |  5 +++--
 testing/clapf/clapf.pre-install                           |  4 +++-
 testing/cluster-glue/cluster-glue.pre-install             |  9 +++++----
 testing/consul/consul.pre-install                         |  6 +++---
 testing/crtmpserver/crtmpserver.pre-install               |  4 +++-
 testing/dante/dante-server.pre-install                    |  3 ++-
 .../darwin-streaming-server.post-install                  |  6 ++++--
 testing/dbmail/dbmail.pre-install                         |  4 ++--
 testing/dnscrypt-proxy/dnscrypt-proxy.pre-install         |  4 +++-
 testing/drizzle/drizzle.post-install                      |  8 ++++++--
 testing/dspam/dspam.pre-install                           |  4 ++--
 testing/ejabberd/ejabberd.pre-install                     |  4 +++-
 testing/elasticsearch/elasticsearch.pre-install           |  6 +++---
 testing/emby/emby.pre-install                             |  8 +++++---
 testing/exim/exim.pre-install                             |  2 +-
 testing/fcron/fcron.pre-install                           |  6 ++++--
 testing/gdnsd/gdnsd.pre-install                           |  5 +++--
 testing/gogs/gogs.pre-install                             |  6 ++++--
 testing/h2o/h2o.pre-install                               |  4 ++--
 testing/knot/knot.pre-install                             |  2 +-
 testing/lightdm/lightdm.pre-install                       |  4 +++-
 testing/lizardfs/lizardfs.pre-install                     |  3 ++-
 testing/logstash/logstash.pre-install                     |  4 ++--
 testing/lshell/lshell.pre-install                         |  4 +++-
 testing/lusca/lusca.pre-install                           |  7 ++++---
 testing/lusca/lusca.pre-upgrade                           |  7 ++++---
 testing/milter-greylist/milter-greylist.pre-install       |  6 ++++--
 testing/mlocate/mlocate.pre-install                       |  2 ++
 testing/mongodb/mongodb.pre-install                       |  5 +++--
 testing/motion/motion.pre-install                         |  7 ++++---
 testing/munin/munin-node.pre-install                      |  4 ++--
 testing/namecoin/namecoin.pre-install                     |  5 +++--
 testing/nginx-naxsi/nginx-naxsi.pre-install               |  6 +++---
 testing/ntopng/ntopng.pre-install                         |  4 +++-
 testing/nut/nut.pre-install                               |  1 +
 testing/opennebula/opennebula-node-kvm.pre-install        |  7 ++++---
 testing/opennebula/opennebula.pre-install                 |  7 ++++---
 testing/opensips/opensips.pre-install                     |  2 +-
 testing/openxcap/openxcap.pre-install                     |  5 +++--
 testing/pdns/pdns.pre-install                             |  3 ++-
 testing/prosody/prosody.pre-install                       |  8 +++++---
 testing/qpage/qpage.pre-install                           |  4 +++-
 testing/quicktun/quicktun.pre-install                     |  7 ++++---
 testing/radicale/radicale.pre-install                     |  4 +++-
 testing/rancid/rancid.pre-install                         |  5 +++--
 testing/rmilter/rmilter.pre-install                       |  2 +-
 testing/rrdbot/rrdbot.pre-install                         |  2 +-
 testing/rspamd/rspamd.pre-install                         |  2 +-
 testing/rutorrent/rutorrent.pre-install                   |  5 +++--
 testing/sipwise-sems/sipwise-sems.pre-install             |  8 ++------
 testing/socklog/socklog.post-install                      |  3 ++-
 testing/stunnel/stunnel.pre-install                       |  3 ++-
 testing/tengine/tengine.pre-install                       |  6 +++---
 testing/tengine/tengine.pre-upgrade                       |  6 +++---
 testing/thttpd/thttpd.pre-install                         |  8 +++++---
 testing/tor/tor.pre-install                               |  5 +++--
 testing/tvheadend-git/tvheadend-git.pre-install           |  4 +++-
 testing/udevil/udevil.pre-install                         |  3 ++-
 testing/vault/vault.pre-install                           |  3 ++-
 testing/vnstat/vnstat.pre-install                         |  3 ++-
 testing/wt/wt.pre-install                                 |  6 ++++--
 testing/x2goserver/x2goserver.pre-install                 |  6 ++++--
 testing/zabbix/zabbix-agent.pre-install                   |  7 ++++---
 testing/zabbix/zabbix.pre-install                         |  3 ++-
 unmaintained/apache-couchdb/apache-couchdb.post-install   |  6 ++++--
 unmaintained/ejabberd-git/ejabberd-git.pre-install        |  4 +++-
 unmaintained/kde-workspace/kde-workspace.pre-install      |  4 +++-
 unmaintained/shadowircd/shadowircd.pre-install            |  4 +++-
 202 files changed, 544 insertions(+), 374 deletions(-)

-- 
2.6.6




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 1/7] Reorder options passed to addgroup in scripts: make -S first.

Przemyslaw Pawelczyk
Details
Message ID
<1461410021-29808-2-git-send-email-przemoc@zoho.com>
In-Reply-To
<1461410021-29808-1-git-send-email-przemoc@zoho.com> (view parent)
Sender timestamp
1461410015
DKIM signature
missing
Download raw message
Patch: +14 -14
It's only for consistency and to ease spotting lack of it.
---
 community/redmine/redmine.pre-install                | 2 +-
 main/apache2/apache2.pre-install                     | 2 +-
 main/apache2/apache2.pre-upgrade                     | 2 +-
 main/darkhttpd/darkhttpd.pre-install                 | 2 +-
 main/lighttpd/lighttpd.pre-install                   | 2 +-
 main/mini_httpd/mini_httpd.pre-install               | 2 +-
 main/nginx-initscripts/nginx-initscripts.pre-install | 2 +-
 main/qemu/qemu.pre-install                           | 2 +-
 testing/h2o/h2o.pre-install                          | 2 +-
 testing/nginx-naxsi/nginx-naxsi.pre-install          | 2 +-
 testing/tengine/tengine.pre-install                  | 2 +-
 testing/tengine/tengine.pre-upgrade                  | 2 +-
 testing/thttpd/thttpd.pre-install                    | 2 +-
 testing/wt/wt.pre-install                            | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/community/redmine/redmine.pre-install b/community/redmine/redmine.pre-install
index 780b89f..f382844 100644
--- a/community/redmine/redmine.pre-install
+++ b/community/redmine/redmine.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D redmine 2>/dev/null
 addgroup redmine www-data 2>/dev/null
 
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index 7b93899..762de83 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
 exit 0
diff --git a/main/apache2/apache2.pre-upgrade b/main/apache2/apache2.pre-upgrade
index d5005d2..dbc1d68 100644
--- a/main/apache2/apache2.pre-upgrade
+++ b/main/apache2/apache2.pre-upgrade
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup apache www-data 2>/dev/null
 exit 0
diff --git a/main/darkhttpd/darkhttpd.pre-install b/main/darkhttpd/darkhttpd.pre-install
index 2ba71fb..80cfa6b 100644
--- a/main/darkhttpd/darkhttpd.pre-install
+++ b/main/darkhttpd/darkhttpd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D darkhttpd \
 	2>/dev/null
 addgroup darkhttpd www-data 2>/dev/null
diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install
index 578814d..9520292 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null
 addgroup lighttpd www-data 2>/dev/null
 
diff --git a/main/mini_httpd/mini_httpd.pre-install b/main/mini_httpd/mini_httpd.pre-install
index d84f0b7..3b5258a 100644
--- a/main/mini_httpd/mini_httpd.pre-install
+++ b/main/mini_httpd/mini_httpd.pre-install
@@ -7,7 +7,7 @@ if [ -f /etc/mini_httpd.conf ] && ! [ -L /etc/mini_httpd.conf ]; then
 		&& ln -s mini_httpd/mini_httpd.conf /etc/mini_httpd.conf
 fi
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
         -D minihttpd 2>/dev/null
 addgroup minihttpd www-data 2>/dev/null
diff --git a/main/nginx-initscripts/nginx-initscripts.pre-install b/main/nginx-initscripts/nginx-initscripts.pre-install
index 55b5bfc..63db1e9 100644
--- a/main/nginx-initscripts/nginx-initscripts.pre-install
+++ b/main/nginx-initscripts/nginx-initscripts.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
 adduser -S -G nginx -H -h /var/www/localhost/htdocs -s /sbin/nologin \
 	-D nginx 2>/dev/null
diff --git a/main/qemu/qemu.pre-install b/main/qemu/qemu.pre-install
index ffee1f8..d644941 100644
--- a/main/qemu/qemu.pre-install
+++ b/main/qemu/qemu.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-getent group kvm >/dev/null || addgroup -g 34 -S kvm
+getent group kvm >/dev/null || addgroup -S -g 34 kvm
diff --git a/testing/h2o/h2o.pre-install b/testing/h2o/h2o.pre-install
index 7fc8104..12a76a0 100644
--- a/testing/h2o/h2o.pre-install
+++ b/testing/h2o/h2o.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 adduser -s /sbin/nologin -h /var/www -D -S -H h2o 2>/dev/null 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup h2o www-data 2>/dev/null
 
 exit 0
diff --git a/testing/nginx-naxsi/nginx-naxsi.pre-install b/testing/nginx-naxsi/nginx-naxsi.pre-install
index 55b5bfc..63db1e9 100644
--- a/testing/nginx-naxsi/nginx-naxsi.pre-install
+++ b/testing/nginx-naxsi/nginx-naxsi.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
 adduser -S -G nginx -H -h /var/www/localhost/htdocs -s /sbin/nologin \
 	-D nginx 2>/dev/null
diff --git a/testing/tengine/tengine.pre-install b/testing/tengine/tengine.pre-install
index 5d0abf7..5e32855 100644
--- a/testing/tengine/tengine.pre-install
+++ b/testing/tengine/tengine.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S tengine 2>/dev/null
 adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \
 	-D tengine 2>/dev/null
diff --git a/testing/tengine/tengine.pre-upgrade b/testing/tengine/tengine.pre-upgrade
index 5d0abf7..5e32855 100644
--- a/testing/tengine/tengine.pre-upgrade
+++ b/testing/tengine/tengine.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S tengine 2>/dev/null
 adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \
 	-D tengine 2>/dev/null
diff --git a/testing/thttpd/thttpd.pre-install b/testing/thttpd/thttpd.pre-install
index f740838..104f72b 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
         -D thttpd 2>/dev/null
 addgroup thttpd www-data 2>/dev/null
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index ad7cbed..8fca39d 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -H -s /sbin/nologin -D wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
 exit 0
-- 
2.6.6




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 2/7] Reorder options passed to adduser in scripts: make -S first.

Przemyslaw Pawelczyk
Details
Message ID
<1461410021-29808-3-git-send-email-przemoc@zoho.com>
In-Reply-To
<1461410021-29808-1-git-send-email-przemoc@zoho.com> (view parent)
Sender timestamp
1461410016
DKIM signature
missing
Download raw message
Patch: +37 -37
It's only for consistency and to ease spotting lack of it.
---
 community/smstools/smstools.pre-install                              | 2 +-
 community/sniproxy/sniproxy.pre-install                              | 2 +-
 main/amavisd-new/amavisd-new.pre-install                             | 2 +-
 main/avahi/avahi.pre-install                                         | 4 ++--
 main/backuppc/backuppc.pre-install                                   | 2 +-
 main/bacula-client/bacula-client.pre-install                         | 2 +-
 main/bacula/bacula.pre-install                                       | 2 +-
 main/charybdis/charybdis.pre-install                                 | 2 +-
 main/ircservices/ircservices.pre-install                             | 2 +-
 main/nginx/nginx-common.pre-install                                  | 2 +-
 main/nsd/nsd.pre-install                                             | 2 +-
 main/ntop/ntop.pre-install                                           | 2 +-
 main/openldap/openldap.pre-install                                   | 2 +-
 main/opentracker/opentracker.pre-install                             | 2 +-
 main/perdition/perdition.pre-install                                 | 2 +-
 main/sircbot/sircbot.pre-install                                     | 2 +-
 main/smokeping/smokeping.pre-install                                 | 2 +-
 main/snmptt/snmptt.pre-install                                       | 2 +-
 main/umurmur/umurmur.post-install                                    | 2 +-
 main/uvncrepeater/uvncrepeater.pre-install                           | 2 +-
 main/vsftpd/vsftpd.pre-install                                       | 2 +-
 testing/consul/consul.pre-install                                    | 2 +-
 testing/darwin-streaming-server/darwin-streaming-server.post-install | 2 +-
 testing/elasticsearch/elasticsearch.pre-install                      | 4 ++--
 testing/exim/exim.pre-install                                        | 2 +-
 testing/h2o/h2o.pre-install                                          | 2 +-
 testing/knot/knot.pre-install                                        | 2 +-
 testing/logstash/logstash.pre-install                                | 2 +-
 testing/ntopng/ntopng.pre-install                                    | 2 +-
 testing/openxcap/openxcap.pre-install                                | 2 +-
 testing/rmilter/rmilter.pre-install                                  | 2 +-
 testing/rspamd/rspamd.pre-install                                    | 2 +-
 testing/tor/tor.pre-install                                          | 2 +-
 unmaintained/apache-couchdb/apache-couchdb.post-install              | 2 +-
 unmaintained/shadowircd/shadowircd.pre-install                       | 2 +-
 35 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index dc25044..638266c 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S smsd &>/dev/null
-adduser -h /var/spool/sms -s /sbin/nologin -G smsd -S -D smsd &>/dev/null
+adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D smsd &>/dev/null
 adduser -G uucp smsd &>/dev/null
 exit 0
diff --git a/community/sniproxy/sniproxy.pre-install b/community/sniproxy/sniproxy.pre-install
index 596dad6..0c6ea46 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S sniproxy 2>/dev/null
-adduser -h /var/log/sniproxy -s /bin/false -S -D sniproxy 2>/dev/null
+adduser -S -h /var/log/sniproxy -s /bin/false -D sniproxy 2>/dev/null
 exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index 431d9ab..691ae27 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup amavis 2>/dev/null
-adduser -D -S -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null
+adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null
 exit 0
 
diff --git a/main/avahi/avahi.pre-install b/main/avahi/avahi.pre-install
index 331e4d5..33802ca 100644
--- a/main/avahi/avahi.pre-install
+++ b/main/avahi/avahi.pre-install
@@ -2,10 +2,10 @@
 
 addgroup -S -g 28 netdev 2>/dev/null
 addgroup -S -g 86 avahi 2>/dev/null
-adduser -u 86 \
+adduser -S -u 86 \
 	-h /var/run/avahi-daemon \
 	-s /sbin/nologin \
-	-S -D -H \
+	-D -H \
 	-g "Avahi System User" \
 	-G avahi \
 	avahi 2>/dev/null
diff --git a/main/backuppc/backuppc.pre-install b/main/backuppc/backuppc.pre-install
index 04a7ce1..32440ee 100644
--- a/main/backuppc/backuppc.pre-install
+++ b/main/backuppc/backuppc.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S backuppc &>/dev/null
-adduser -h /var/lib/BackupPC -s /bin/sh -S -D -H -G backuppc -g "BackupPC user" backuppc &>/dev/null
+adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc &>/dev/null
 exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 6cbd0e6..0eb2cab 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S bacula 2>/dev/null
-adduser -h /var/lib/bacula/ -s /sbin/nologin -G bacula -S -D bacula 2>/dev/null
+adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null
 exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 6cbd0e6..0eb2cab 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S bacula 2>/dev/null
-adduser -h /var/lib/bacula/ -s /sbin/nologin -G bacula -S -D bacula 2>/dev/null
+adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null
 exit 0
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
index d36c3c6..3c120d3 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -h /var/run/charybdis -s /sbin/nologin -S -D ircd 2>/dev/null
+adduser -S -h /var/run/charybdis -s /sbin/nologin -D ircd 2>/dev/null
 exit 0
diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install
index e043482..5016c89 100644
--- a/main/ircservices/ircservices.pre-install
+++ b/main/ircservices/ircservices.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /var/lib/ircservices -s /sbin/nologin -S -D ircservices 2>/dev/null
+adduser -S -h /var/lib/ircservices -s /sbin/nologin -D ircservices 2>/dev/null
 exit 0
 
diff --git a/main/nginx/nginx-common.pre-install b/main/nginx/nginx-common.pre-install
index 823de3a..27bf2de 100644
--- a/main/nginx/nginx-common.pre-install
+++ b/main/nginx/nginx-common.pre-install
@@ -2,7 +2,7 @@
 
 addgroup -Sg 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
-adduser -h /var/lib/nginx -g "nginx" -s /sbin/nologin -SDHG nginx nginx 2>/dev/null
+adduser -S -h /var/lib/nginx -g "nginx" -s /sbin/nologin -DHG nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0
diff --git a/main/nsd/nsd.pre-install b/main/nsd/nsd.pre-install
index 80edbd1..7f92eca 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S nsd 2>/dev/null
-adduser -G nsd -S -H -h /var/db/nsd -s /sbin/nologin nsd 2>/dev/null
+adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin nsd 2>/dev/null
 exit 0
diff --git a/main/ntop/ntop.pre-install b/main/ntop/ntop.pre-install
index 1ace75c..e22ff3e 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S ntop 2>/dev/null
-adduser -h /var/lib/ntop -s /sbin/nologin -S -G ntop -H -D ntop 2>/dev/null
+adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null
 exit 0
diff --git a/main/openldap/openldap.pre-install b/main/openldap/openldap.pre-install
index f5d586f..a01f4fa 100644
--- a/main/openldap/openldap.pre-install
+++ b/main/openldap/openldap.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S ldap 2>/dev/null
-adduser -h /usr/lib/openldap -s /sbin/nologin -S -D -H -g "OpenLdap User" \
+adduser -S -h /usr/lib/openldap -s /sbin/nologin -D -H -g "OpenLdap User" \
 	-G ldap ldap 2>/dev/null
 
 exit 0
diff --git a/main/opentracker/opentracker.pre-install b/main/opentracker/opentracker.pre-install
index c6fc95e..8d619f6 100644
--- a/main/opentracker/opentracker.pre-install
+++ b/main/opentracker/opentracker.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -D -S -H -h /var/empty -s /sbin/false opentracker 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/false opentracker 2>/dev/null
 exit 0
 
diff --git a/main/perdition/perdition.pre-install b/main/perdition/perdition.pre-install
index 61a3eef..5d9148f 100644
--- a/main/perdition/perdition.pre-install
+++ b/main/perdition/perdition.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S perdition 2>/dev/null
-adduser -h /var/run/perdition -s /sbin/nologin -S -G perdition -D perdition 2>/dev/null
+adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D perdition 2>/dev/null
 
 exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index 36adc6c..450fff3 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup sircbot 2>/dev/null
-adduser -h /var/run/sircbot -G sircbot -S -D sircbot 2>/dev/null
+adduser -S -h /var/run/sircbot -G sircbot -D sircbot 2>/dev/null
 exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index 236550f..490c4c1 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup smokeping 2>/dev/null
-adduser -h /var/lib/smokeping -S -D -G smokeping smokeping 2>/dev/null
+adduser -S -h /var/lib/smokeping -D -G smokeping smokeping 2>/dev/null
 exit 0
diff --git a/main/snmptt/snmptt.pre-install b/main/snmptt/snmptt.pre-install
index 873986f..6619337 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -h /var/spool/snmptt -s /sbin/nologin -S -D snmptt &>/dev/null
+adduser -S -h /var/spool/snmptt -s /sbin/nologin -D snmptt &>/dev/null
 exit 0
diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index 4373bd7..9d5f408 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S umurmur &>/dev/null
-adduser -s /bin/false -G umurmur -h /var/run/umurmurd -S -D umurmur &>/dev/null
+adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D umurmur &>/dev/null
 exit 0
diff --git a/main/uvncrepeater/uvncrepeater.pre-install b/main/uvncrepeater/uvncrepeater.pre-install
index 2e1e673..a1126c6 100644
--- a/main/uvncrepeater/uvncrepeater.pre-install
+++ b/main/uvncrepeater/uvncrepeater.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -D -S uvncrep 2>/dev/null
+adduser -S -D uvncrep 2>/dev/null
 exit 0
 
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index e60f9d8..4bdf064 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup ftp &>/dev/null
 addgroup vsftp ftp &>/dev/null
-adduser -h /var/lib/ftp -s /sbin/nologin -G ftp -S vsftp &>/dev/null
+adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp vsftp &>/dev/null
 exit 0
diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install
index aef4230..6e11c5b 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
@@ -2,6 +2,6 @@
 
 # Create consul group and user
 addgroup -S consul 2> /dev/null
-adduser -h /var/consul -s /sbin/nologin -G consul -S -D consul 2> /dev/null
+adduser -S -h /var/consul -s /sbin/nologin -G consul -D consul 2> /dev/null
 exit 0
 
diff --git a/testing/darwin-streaming-server/darwin-streaming-server.post-install b/testing/darwin-streaming-server/darwin-streaming-server.post-install
index bfd9a90..607ec15 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S qtss &>/dev/null
-adduser -s /bin/false -G qtss -h /var/darwinstreaming -S -D qtss &>/dev/null
+adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D qtss &>/dev/null
 exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 042588e..9e96765 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup elastico
-adduser -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
-	-g "added by apk for elasticsearch" -SDH elastico
+adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
+	-g "added by apk for elasticsearch" -DH elastico
 
 exit 0
diff --git a/testing/exim/exim.pre-install b/testing/exim/exim.pre-install
index de73721..816ed96 100644
--- a/testing/exim/exim.pre-install
+++ b/testing/exim/exim.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S exim 2>/dev/null
-adduser -h /var/spool/exim -g "exim" -s /sbin/nologin -SDHG exim exim 2>/dev/null
+adduser -S -h /var/spool/exim -g "exim" -s /sbin/nologin -DHG exim exim 2>/dev/null
 adduser exim mail 2>/dev/null
 
 exit 0
diff --git a/testing/h2o/h2o.pre-install b/testing/h2o/h2o.pre-install
index 12a76a0..358f4a2 100644
--- a/testing/h2o/h2o.pre-install
+++ b/testing/h2o/h2o.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -s /sbin/nologin -h /var/www -D -S -H h2o 2>/dev/null 
+adduser -S -s /sbin/nologin -h /var/www -D -H h2o 2>/dev/null 
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup h2o www-data 2>/dev/null
 
diff --git a/testing/knot/knot.pre-install b/testing/knot/knot.pre-install
index 57bc704..82be3a6 100644
--- a/testing/knot/knot.pre-install
+++ b/testing/knot/knot.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S knot 2>/dev/null
-adduser -s /sbin/nologin -G knot -S -D -H knot 2>/dev/null
+adduser -S -s /sbin/nologin -G knot -D -H knot 2>/dev/null
 
 exit 0
diff --git a/testing/logstash/logstash.pre-install b/testing/logstash/logstash.pre-install
index 056badb..6844757 100644
--- a/testing/logstash/logstash.pre-install
+++ b/testing/logstash/logstash.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -h /usr/share/logstash -s /sbin/nologin -S -D -H -g "Logstash User" \
+adduser -S -h /usr/share/logstash -s /sbin/nologin -D -H -g "Logstash User" \
 	-G daemon logstash 2>/dev/null
 
 exit 0
diff --git a/testing/ntopng/ntopng.pre-install b/testing/ntopng/ntopng.pre-install
index 1ace75c..e22ff3e 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S ntop 2>/dev/null
-adduser -h /var/lib/ntop -s /sbin/nologin -S -G ntop -H -D ntop 2>/dev/null
+adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index cc2b529..c67a449 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup openxcap 2>/dev/null
-adduser -G openxcap -h /var/run/openxcap -s /bin/false -S -D -H openxcap 2>/dev/null
+adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H openxcap 2>/dev/null
 exit 0
diff --git a/testing/rmilter/rmilter.pre-install b/testing/rmilter/rmilter.pre-install
index b7dc736..bda1a94 100644
--- a/testing/rmilter/rmilter.pre-install
+++ b/testing/rmilter/rmilter.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rmilter 2>dev/null
-adduser -h /run/rmilter -g "rmilter" -s /bin/false -SDHG rmilter rmilter 2>/dev/null
+adduser -S -h /run/rmilter -g "rmilter" -s /bin/false -DHG rmilter rmilter 2>/dev/null
 
 exit 0
diff --git a/testing/rspamd/rspamd.pre-install b/testing/rspamd/rspamd.pre-install
index 7f00b36..b107f1c 100644
--- a/testing/rspamd/rspamd.pre-install
+++ b/testing/rspamd/rspamd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rspamd 2>/dev/null
-adduser -h /var/lib/rspamd -g "rspamd" -s /bin/false -SDHG rspamd rspamd 2>/dev/null
+adduser -S -h /var/lib/rspamd -g "rspamd" -s /bin/false -DHG rspamd rspamd 2>/dev/null
 
 exit 0
diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install
index e036984..9db7ac8 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -h /var/run/tor -s /sbin/nologin -S -D tor 2>/dev/null
+adduser -S -h /var/run/tor -s /sbin/nologin -D tor 2>/dev/null
 exit 0
 
diff --git a/unmaintained/apache-couchdb/apache-couchdb.post-install b/unmaintained/apache-couchdb/apache-couchdb.post-install
index 5cc944e..4d3b841 100755
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ b/unmaintained/apache-couchdb/apache-couchdb.post-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S couchdb &>/dev/null
-adduser -h /var/run/couchdb -s /bin/false -G couchdb -S -D couchdb &>/dev/null
+adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D couchdb &>/dev/null
 exit 0
diff --git a/unmaintained/shadowircd/shadowircd.pre-install b/unmaintained/shadowircd/shadowircd.pre-install
index e40f840..f8d24e4 100644
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ b/unmaintained/shadowircd/shadowircd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -h /var/run/shadowircd -s /bin/false -S -D ircd 2>/dev/null
+adduser -S -h /var/run/shadowircd -s /bin/false -D ircd 2>/dev/null
 exit 0
-- 
2.6.6




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 3/7] Add lacking -S option (system) to adduser/addgroup in scripts.

Przemyslaw Pawelczyk
Details
Message ID
<1461410021-29808-4-git-send-email-przemoc@zoho.com>
In-Reply-To
<1461410021-29808-1-git-send-email-przemoc@zoho.com> (view parent)
Sender timestamp
1461410017
DKIM signature
missing
Download raw message
Patch: +104 -104
Groups and users created by packages shouldn't use high ids by default
(unless explicitly requested), to distinguish them from groups and users
created by administrators for humans.

Following 41 files lacked -S next to addgroup:
- community/sword/sword.pre-install
- main/amavisd-new/amavisd-new.pre-install
- main/chrony/chrony.pre-install
- main/cvechecker/cvechecker.pre-install
- main/dnsmasq/dnsmasq.pre-install
- main/freeradius/freeradius.pre-install
- main/gdnsd/gdnsd.pre-install
- main/haproxy/haproxy.pre-install
- main/haproxy/haproxy.pre-upgrade
- main/kamailio/kamailio.pre-install
- main/logcheck/logcheck.pre-install
- main/mlmmj/mlmmj.pre-install
- main/nrpe/nrpe.pre-install
- main/open-vm-tools/open-vm-tools.pre-install
- main/postgrey/postgrey.pre-install
- main/privoxy/privoxy.pre-install
- main/redis/redis.pre-install
- main/samba/winbind.pre-install
- main/sircbot/sircbot.pre-install
- main/smokeping/smokeping.pre-install
- main/squark/squark.post-install
- main/squid/squid.pre-install
- main/squid/squid.pre-upgrade
- main/subversion/subversion.pre-install
- main/trac/trac.pre-install
- main/vsftpd/vsftpd.pre-install
- main/zabbix/zabbix-agent.pre-install
- testing/3proxy/3proxy.pre-install
- testing/cluster-glue/cluster-glue.pre-install
- testing/elasticsearch/elasticsearch.pre-install
- testing/emby/emby.pre-install
- testing/gdnsd/gdnsd.pre-install
- testing/icinga2/icinga2.pre-install
- testing/lusca/lusca.pre-install
- testing/lusca/lusca.pre-upgrade
- testing/mongodb/mongodb.pre-install
- testing/openxcap/openxcap.pre-install
- testing/prosody/prosody.pre-install
- testing/rancid/rancid.pre-install
- testing/rutorrent/rutorrent.pre-install
- testing/zabbix/zabbix-agent.pre-install

Following 60 files lacked -S next to adduser:
- community/caddy/caddy.pre-install
- community/domoticz/domoticz.pre-install
- community/minetest/minetest-server.pre-install
- community/oscam/oscam.pre-install
- community/seafile/seafile-server.pre-install
- community/syncthing/syncthing.pre-install
- main/apache2/apache2.pre-install
- main/aports-build/aports-build.pre-install
- main/atheme-iris/atheme-iris.pre-install
- main/bind/bind.pre-install
- main/clamav/clamav-db.pre-install
- main/clamsmtp/clamsmtp.pre-install
- main/clamsmtp/clamsmtp.pre-upgrade
- main/coova-chilli/coova-chilli.pre-install
- main/cvechecker/cvechecker.pre-install
- main/dhcp/dhcp.pre-install
- main/distcc/distcc.pre-install
- main/djbdns/dnscache.pre-install
- main/djbdns/tinydns.pre-install
- main/dovecot/dovecot.pre-install
- main/ez-ipupdate/ez-ipupdate.pre-install
- main/fetchmail/fetchmail.pre-install
- main/freeswitch/freeswitch.pre-install
- main/gitolite/gitolite.pre-install
- main/gnats/gnats.pre-install
- main/gross/gross.pre-install
- main/icecast/icecast.pre-install
- main/kamailio/kamailio.pre-install
- main/lighttpd/lighttpd.pre-install
- main/mariadb/mariadb.pre-install
- main/memcached/memcached.pre-install
- main/ngircd/ngircd.pre-install
- main/nrpe/nrpe.pre-install
- main/openntpd/openntpd.pre-install
- main/postgrey/postgrey.pre-install
- main/snort/snort.pre-install
- main/squid/squid.pre-install
- main/squid/squid.pre-upgrade
- main/subversion/subversion.pre-install
- main/trac/trac.pre-install
- main/transmission/transmission-daemon.pre-install
- main/ympd/ympd.pre-install
- main/znc/znc.pre-install
- testing/at/at.pre-install
- testing/buildbot-slave/buildbot-slave.pre-install
- testing/buildbot/buildbot.pre-install
- testing/clapf/clapf.pre-install
- testing/cluster-glue/cluster-glue.pre-install
- testing/dbmail/dbmail.pre-install
- testing/dspam/dspam.pre-install
- testing/ejabberd/ejabberd.pre-install
- testing/emby/emby.pre-install
- testing/mongodb/mongodb.pre-install
- testing/opensips/opensips.pre-install
- testing/pdns/pdns.pre-install
- testing/prosody/prosody.pre-install
- testing/qpage/qpage.pre-install
- testing/rrdbot/rrdbot.pre-install
- testing/wt/wt.pre-install
- unmaintained/ejabberd-git/ejabberd-git.pre-install
---
 community/caddy/caddy.pre-install                  | 2 +-
 community/domoticz/domoticz.pre-install            | 2 +-
 community/icinga2/icinga2.pre-install              | 4 ++--
 community/minetest/minetest-server.pre-install     | 2 +-
 community/oscam/oscam.pre-install                  | 2 +-
 community/seafile/seafile-server.pre-install       | 2 +-
 community/sword/sword.pre-install                  | 2 +-
 community/syncthing/syncthing.pre-install          | 2 +-
 main/amavisd-new/amavisd-new.pre-install           | 2 +-
 main/apache2/apache2.pre-install                   | 2 +-
 main/aports-build/aports-build.pre-install         | 2 +-
 main/atheme-iris/atheme-iris.pre-install           | 2 +-
 main/bind/bind.pre-install                         | 2 +-
 main/chrony/chrony.pre-install                     | 2 +-
 main/clamav/clamav-db.pre-install                  | 2 +-
 main/clamsmtp/clamsmtp.pre-install                 | 2 +-
 main/clamsmtp/clamsmtp.pre-upgrade                 | 2 +-
 main/coova-chilli/coova-chilli.pre-install         | 2 +-
 main/cvechecker/cvechecker.pre-install             | 4 ++--
 main/dhcp/dhcp.pre-install                         | 2 +-
 main/distcc/distcc.pre-install                     | 2 +-
 main/djbdns/dnscache.pre-install                   | 2 +-
 main/djbdns/tinydns.pre-install                    | 2 +-
 main/dnsmasq/dnsmasq.pre-install                   | 2 +-
 main/dovecot/dovecot.pre-install                   | 4 ++--
 main/ez-ipupdate/ez-ipupdate.pre-install           | 2 +-
 main/fetchmail/fetchmail.pre-install               | 2 +-
 main/freeradius/freeradius.pre-install             | 2 +-
 main/freeswitch/freeswitch.pre-install             | 2 +-
 main/gdnsd/gdnsd.pre-install                       | 2 +-
 main/gitolite/gitolite.pre-install                 | 2 +-
 main/gnats/gnats.pre-install                       | 2 +-
 main/gross/gross.pre-install                       | 2 +-
 main/haproxy/haproxy.pre-install                   | 2 +-
 main/haproxy/haproxy.pre-upgrade                   | 2 +-
 main/icecast/icecast.pre-install                   | 2 +-
 main/kamailio/kamailio.pre-install                 | 4 ++--
 main/lighttpd/lighttpd.pre-install                 | 2 +-
 main/logcheck/logcheck.pre-install                 | 2 +-
 main/mariadb/mariadb.pre-install                   | 2 +-
 main/memcached/memcached.pre-install               | 2 +-
 main/mlmmj/mlmmj.pre-install                       | 2 +-
 main/ngircd/ngircd.pre-install                     | 2 +-
 main/nrpe/nrpe.pre-install                         | 4 ++--
 main/open-vm-tools/open-vm-tools.pre-install       | 2 +-
 main/openntpd/openntpd.pre-install                 | 2 +-
 main/postgrey/postgrey.pre-install                 | 4 ++--
 main/privoxy/privoxy.pre-install                   | 2 +-
 main/redis/redis.pre-install                       | 2 +-
 main/samba/winbind.pre-install                     | 2 +-
 main/sircbot/sircbot.pre-install                   | 2 +-
 main/smokeping/smokeping.pre-install               | 2 +-
 main/snort/snort.pre-install                       | 2 +-
 main/squark/squark.post-install                    | 2 +-
 main/squid/squid.pre-install                       | 4 ++--
 main/squid/squid.pre-upgrade                       | 4 ++--
 main/subversion/subversion.pre-install             | 4 ++--
 main/trac/trac.pre-install                         | 4 ++--
 main/transmission/transmission-daemon.pre-install  | 2 +-
 main/vsftpd/vsftpd.pre-install                     | 2 +-
 main/ympd/ympd.pre-install                         | 2 +-
 main/zabbix/zabbix-agent.pre-install               | 2 +-
 main/znc/znc.pre-install                           | 2 +-
 testing/3proxy/3proxy.pre-install                  | 2 +-
 testing/at/at.pre-install                          | 2 +-
 testing/buildbot-slave/buildbot-slave.pre-install  | 2 +-
 testing/buildbot/buildbot.pre-install              | 2 +-
 testing/clapf/clapf.pre-install                    | 2 +-
 testing/cluster-glue/cluster-glue.pre-install      | 4 ++--
 testing/dbmail/dbmail.pre-install                  | 2 +-
 testing/dspam/dspam.pre-install                    | 2 +-
 testing/ejabberd/ejabberd.pre-install              | 2 +-
 testing/elasticsearch/elasticsearch.pre-install    | 2 +-
 testing/emby/emby.pre-install                      | 4 ++--
 testing/gdnsd/gdnsd.pre-install                    | 2 +-
 testing/lusca/lusca.pre-install                    | 2 +-
 testing/lusca/lusca.pre-upgrade                    | 2 +-
 testing/mongodb/mongodb.pre-install                | 4 ++--
 testing/opensips/opensips.pre-install              | 2 +-
 testing/openxcap/openxcap.pre-install              | 2 +-
 testing/pdns/pdns.pre-install                      | 2 +-
 testing/prosody/prosody.pre-install                | 4 ++--
 testing/qpage/qpage.pre-install                    | 2 +-
 testing/rancid/rancid.pre-install                  | 2 +-
 testing/rrdbot/rrdbot.pre-install                  | 2 +-
 testing/rutorrent/rutorrent.pre-install            | 2 +-
 testing/wt/wt.pre-install                          | 2 +-
 testing/zabbix/zabbix-agent.pre-install            | 4 ++--
 unmaintained/ejabberd-git/ejabberd-git.pre-install | 2 +-
 89 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index 16d74a3..8c67557 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -h /var/lib/caddy -D -s /sbin/nologin caddy 2>/dev/null
+adduser -S -h /var/lib/caddy -D -s /sbin/nologin 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 a94a5fb..8a7d12c 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null
+adduser -S -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null
 exit 0
diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install
index cd2a432..349c8c8 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
-addgroup icinga 2>/dev/null
-addgroup icingacmd 2>/dev/null
+addgroup -S icinga 2>/dev/null
+addgroup -S icingacmd 2>/dev/null
 adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D icinga 2>/dev/null
 adduser icinga icingacmd 2>/dev/null 2>/dev/null
 exit 0
diff --git a/community/minetest/minetest-server.pre-install b/community/minetest/minetest-server.pre-install
index f995e42..dbf1411 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null
+adduser -S -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index fe379e1..6f2cc9e 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -D -s /sbin/nologin oscam 2>/dev/null
+adduser -S -H -D -s /sbin/nologin oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
 exit 0
diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install
index 173e73a..66e7a2c 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
@@ -3,5 +3,5 @@
 SEAFILE_HOME=/var/lib/seafile
 
 addgroup -S -g 800 seafile 2>/dev/null
-adduser -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
+adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
 exit 0
diff --git a/community/sword/sword.pre-install b/community/sword/sword.pre-install
index 0ab0d71..d8abdb5 100755
--- a/community/sword/sword.pre-install
+++ b/community/sword/sword.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 echo "Adding 'sword' group for installing SWORD modules systemwide"
-addgroup sword 2>/dev/null >&2 || true
+addgroup -S sword 2>/dev/null >&2 || true
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index b2207a0..dd7f389 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null
+adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null
 exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index 691ae27..bd8c3a6 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup amavis 2>/dev/null
+addgroup -S amavis 2>/dev/null
 adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null
 exit 0
 
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index 762de83..81f4b06 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null
+adduser -S -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
 exit 0
diff --git a/main/aports-build/aports-build.pre-install b/main/aports-build/aports-build.pre-install
index e9d9bfb..21bf106 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -D buildozer -s /bin/sh 2>/dev/null
+adduser -S -D buildozer -s /bin/sh 2>/dev/null
 exit 0
diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index 1bb8677..4198df2 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
+adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
 exit 0
 
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 3849716..3770738 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S named 2>/dev/null
-adduser -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null
+adduser -S -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null
 exit 0
 
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
index 2c54ecc..83c4560 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup chrony 2>/dev/null
+addgroup -S chrony 2>/dev/null
 adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D chrony 2>/dev/null
 exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index 7706eef..9bc70dd 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install
index 7706eef..9bc70dd 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index 97d9081..7e736a2 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -10,5 +10,5 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 	echo " *"
 fi
 
-adduser -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D clamav 2>/dev/null
 exit 0
diff --git a/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
index 4bf0c3c..6ef8741 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -s /sbin/nologin -D chilli 2>/dev/null
+adduser -S -H -s /sbin/nologin -D chilli 2>/dev/null
 exit 0
 
diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install
index f2b4535..cf6b144 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-addgroup cvechecker &>/dev/null
-adduser cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
+addgroup -S cvechecker &>/dev/null
+adduser -S cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 7f09003..27fa93f 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null
+adduser -S -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null
 exit 0
 
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index bd7fba2..b07f846 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S distcc 2>/dev/null
-adduser -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null
 exit 0
diff --git a/main/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index f1f948e..106fc29 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
+adduser -S -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
 exit 0
 
diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index e3ab6ce..8676fb4 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
+adduser -S -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
 exit 0
 
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 931d258..3e9e4b0 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup dnsmasq 2>/dev/null
+addgroup -S dnsmasq 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D dnsmasq 2>/dev/null
 exit 0
diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index 432a3b8..58346c6 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -u 90 -H -h /dev/null -s /sbin/nologin -D dovecot 2>/dev/null
-adduser -u 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null
+adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D dovecot 2>/dev/null
+adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null
 exit 0
diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install
index 7c1ea47..064e418 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null
+adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null
 exit 0
 
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index 6122e0c..2961b9a 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null
+adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null
 exit 0
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index 30ff048..b81e86d 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup radius 2>/dev/null
+addgroup -S radius 2>/dev/null
 adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D radius 2>/dev/null
 exit 0
 
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
index 88dcc89..4dccd57 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null
+adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null
 
 exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index dc6e44b..2479466 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup gdnsd 2>/dev/null
+addgroup -S gdnsd 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
 exit 0
diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install
index 79a7a63..fbb1e2a 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null
+adduser -S -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 0a2e5a5..849841f 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -h /var/lib/gnatsdb -D gnats 2>/dev/null
+adduser -S -h /var/lib/gnatsdb -D gnats 2>/dev/null
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index 809dd4c..f79e657 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -s /sbin/nologin -D gross 2>/dev/null
+adduser -S -H -s /sbin/nologin -D gross 2>/dev/null
 exit 0
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 33e0164..4706956 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup haproxy 2>/dev/null
+addgroup -S haproxy 2>/dev/null
 adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
 	-G haproxy haproxy 2>/dev/null
 
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 33e0164..4706956 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup haproxy 2>/dev/null
+addgroup -S haproxy 2>/dev/null
 adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
 	-G haproxy haproxy 2>/dev/null
 
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index e8e8610..9978a4b 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /var/log/icecast -s /sbin/nologin -D icecast  2>/dev/null
+adduser -S -h /var/log/icecast -s /sbin/nologin -D icecast  2>/dev/null
 
 exit 0
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index 58e5bb6..fd7b13e 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup kamailio 2>/dev/null
-adduser -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio  2>/dev/null
+addgroup -S kamailio 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio  2>/dev/null
 
 exit 0
diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install
index 9520292..2349478 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null
+adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null
 addgroup lighttpd www-data 2>/dev/null
 
 exit 0
diff --git a/main/logcheck/logcheck.pre-install b/main/logcheck/logcheck.pre-install
index 61f3c23..b0f2a83 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup logcheck 2>/dev/null
+addgroup -S logcheck 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck logcheck 2>/dev/null
 exit 0
diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install
index 2e6e668..5b68b1e 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mysql 2>/dev/null
-adduser -h /var/lib/mysql -s /sbin/nologin -G mysql -D mysql 2>/dev/null
+adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D mysql 2>/dev/null
 exit 0
 
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index bee8d7f..6612df9 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -H -s /sbin/nologin -D memcached 2>/dev/null
+adduser -S -H -s /sbin/nologin -D memcached 2>/dev/null
 exit 0
 
diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install
index c6043d3..38b8fb8 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup mlmmj 2>/dev/null
+addgroup -S mlmmj 2>/dev/null
 adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj mlmmj 2>/dev/null
 exit 0
diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index 36bc1f8..5c8d34b 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null
+adduser -S -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null
 exit 0
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index 6acde2a..a9a0d38 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
-addgroup nagios 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
+addgroup -S nagios 2>/dev/null
 exit 0
diff --git a/main/open-vm-tools/open-vm-tools.pre-install b/main/open-vm-tools/open-vm-tools.pre-install
index 10b989a..15fbca3 100644
--- a/main/open-vm-tools/open-vm-tools.pre-install
+++ b/main/open-vm-tools/open-vm-tools.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-addgroup vmware 2>/dev/null
+addgroup -S vmware 2>/dev/null
 exit 0
 
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index 0b2be06..feb5d9c 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -H -h /var/empty -s /sbin/nologin -D ntp  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D ntp  2>/dev/null
 
 exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index 21dd01f..480391c 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup postgrey 2>/dev/null
-adduser -H -h /dev/null -s /sbin/nologin -D postgrey  2>/dev/null
+addgroup -S postgrey 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D postgrey  2>/dev/null
 
 exit 0
diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install
index cfc8428..72a917e 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup privoxy 2>/dev/null
+addgroup -S privoxy 2>/dev/null
 adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D privoxy 2>/dev/null
 exit 0
 
diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install
index 2e36f49..479434e 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup redis 2>/dev/null
+addgroup -S redis 2>/dev/null
 adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis redis 2>/dev/null
 exit 0
diff --git a/main/samba/winbind.pre-install b/main/samba/winbind.pre-install
index 792e73a..ac4df3f 100644
--- a/main/samba/winbind.pre-install
+++ b/main/samba/winbind.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 
 exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index 450fff3..453ba5d 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup sircbot 2>/dev/null
+addgroup -S sircbot 2>/dev/null
 adduser -S -h /var/run/sircbot -G sircbot -D sircbot 2>/dev/null
 exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index 490c4c1..8934148 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup smokeping 2>/dev/null
+addgroup -S smokeping 2>/dev/null
 adduser -S -h /var/lib/smokeping -D -G smokeping smokeping 2>/dev/null
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index 80740eb..c8bf706 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null
+adduser -S -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null
 exit 0
diff --git a/main/squark/squark.post-install b/main/squark/squark.post-install
index 28120d3..3c40694 100755
--- a/main/squark/squark.post-install
+++ b/main/squark/squark.post-install
@@ -1,2 +1,2 @@
 #!/bin/sh
-addgroup squark &>/dev/null || exit 0
+addgroup -S squark &>/dev/null || exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index 322d21d..b51ade1 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -D squid -H /var/cache/squid  2>/dev/null
-addgroup winbind 2>/dev/null
+adduser -S -D squid -H /var/cache/squid  2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index 322d21d..b51ade1 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -D squid -H /var/cache/squid  2>/dev/null
-addgroup winbind 2>/dev/null
+adduser -S -D squid -H /var/cache/squid  2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0
diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index fb516ee..ddec16c 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup svnusers 2>/dev/null
-adduser svn -D -h /var/svn -G svnusers 2>/dev/null
+addgroup -S svnusers 2>/dev/null
+adduser -S svn -D -h /var/svn -G svnusers 2>/dev/null
 exit 0
 
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install
index 1479916..f39f2b2 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup tracd 2>/dev/null
-adduser -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
+addgroup -S tracd 2>/dev/null
+adduser -S -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
 exit 0
diff --git a/main/transmission/transmission-daemon.pre-install b/main/transmission/transmission-daemon.pre-install
index 9b7d6cb..2f9a398 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null
+adduser -S -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null
 
 exit 0
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index 4bdf064..200d233 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-addgroup ftp &>/dev/null
+addgroup -S ftp &>/dev/null
 addgroup vsftp ftp &>/dev/null
 adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp vsftp &>/dev/null
 exit 0
diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install
index 0455be2..1bbd045 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -D -s /sbin/nologin -G audio ympd 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -G audio ympd 2>/dev/null
 exit 0
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
index 57d46c2..91ea88c 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup zabbix 2>/dev/null
+addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
 addgroup -g 30 zabbix 2>/dev/null
 exit 0
diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index 91f2f8d..ad5aed9 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -D -s /sbin/nologin znc 2>/dev/null
+adduser -S -H -D -s /sbin/nologin znc 2>/dev/null
 exit 0
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index b1e227a..dbfa438 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup 3proxy 2>/dev/null
+addgroup -S 3proxy 2>/dev/null
 adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D 3proxy 2>/dev/null
 exit 0
 
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index 058a9d0..5372277 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -5,7 +5,7 @@ if ! getent group at >/dev/null; then
 fi
 
 if ! getent passwd at >/dev/null; then
-	adduser -H -s /bin/false -D at 2>/dev/null
+	adduser -S -H -s /bin/false -D at 2>/dev/null
 fi
 
 if [ -z `echo " $(groups at) " | grep ' at '`] ; then
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index 7e52d9c..40e2945 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
 exit 0
 
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index 7e52d9c..40e2945 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
 exit 0
 
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index 01997df..bf78879 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D clamav 2>/dev/null
 exit 0
diff --git a/testing/cluster-glue/cluster-glue.pre-install b/testing/cluster-glue/cluster-glue.pre-install
index 4e7f2f5..056fbde 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-addgroup haclient 2>/dev/null
-adduser hacluster \
+addgroup -S haclient 2>/dev/null
+adduser -S hacluster \
 	-h /var/lib/heartbeat/cores/hacluster \
 	-G haclient \
 	-s /sbin/nologin \
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index 1abaeb9..aa19b67 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -s /bin/false -D -H -h /var/lib/dbmail dbmail 2>/dev/null
+adduser -S -s /bin/false -D -H -h /var/lib/dbmail dbmail 2>/dev/null
 exit 0
 
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index 9a6cc6f..2eb8940 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
+adduser -S -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
 chown dspam:dspam /var/lib/dspam
 exit 0
 
diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index 4111b31..6d80151 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
 exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 9e96765..63e023a 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup elastico
+addgroup -S elastico
 adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
 	-g "added by apk for elasticsearch" -DH elastico
 
diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install
index b3431b2..cfe5965 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-addgroup emby 2>/dev/null
-adduser -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
+addgroup -S emby 2>/dev/null
+adduser -S -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
 	-G emby emby 2>/dev/null
 exit 0
diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
index dc6e44b..2479466 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup gdnsd 2>/dev/null
+addgroup -S gdnsd 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
 exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 2ed0cc5..7679028 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 adduser -S -D lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup lusca winbind
 exit 0
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index 2ed0cc5..7679028 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 adduser -S -D lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup lusca winbind
 exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 9b4b642..432d983 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup mongodb
-adduser -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
+addgroup -S mongodb
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
 exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 4b9ccd4..5da9a0e 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -H -h /var/empty -s /bin/false -D opensips  2>/dev/null
+adduser -S -H -h /var/empty -s /bin/false -D opensips  2>/dev/null
 
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index c67a449..0323113 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup openxcap 2>/dev/null
+addgroup -S openxcap 2>/dev/null
 adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H openxcap 2>/dev/null
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index c9d2d14..2565d49 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -h /var/empty -D -s /bin/false pdns 2>/dev/null
+adduser -S -H -h /var/empty -D -s /bin/false pdns 2>/dev/null
 exit 0
diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install
index 2dbe8bf..e2fab21 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
-addgroup prosody 2>/dev/null
-adduser -D \
+addgroup -S prosody 2>/dev/null
+adduser -S -D \
 	-h /var/lib/prosody \
 	-s /sbin/nologin \
 	-g "Prosody XMPP Server" \
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index c463899..160fc0b 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-adduser -h /var/lib/qpage -s /bin/false -G qpage -D qpage 2>/dev/null || true
+adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D qpage 2>/dev/null || true
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index aa86d1c..55691b2 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup netadm 2>/dev/null
+addgroup -S netadm 2>/dev/null
 adduser -S -h /var/rancid -s /bin/sh -G netadm -D rancid 2>/dev/null
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 2c35d02..ab339f8 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -H -s /bin/false -D rrdbotd  2>/dev/null
+adduser -S -H -s /bin/false -D rrdbotd  2>/dev/null
 
 exit 0
diff --git a/testing/rutorrent/rutorrent.pre-install b/testing/rutorrent/rutorrent.pre-install
index 2d0c909..0d81455 100644
--- a/testing/rutorrent/rutorrent.pre-install
+++ b/testing/rutorrent/rutorrent.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-addgroup rutorrent 2>/dev/null
+addgroup -S rutorrent 2>/dev/null
 exit 0
 
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index 8fca39d..e4478b2 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -H -s /sbin/nologin -D wt 2>/dev/null
+adduser -S -H -s /sbin/nologin -D wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
 exit 0
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
index 57d46c2..3e42ff0 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup zabbix 2>/dev/null
+addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
-addgroup -g 30 zabbix 2>/dev/null
+addgroup -S -g 30 zabbix 2>/dev/null
 exit 0
diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install
index 4111b31..6d80151 100644
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
 exit 0
-- 
2.6.6




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 4/7] Add -g option (GECOS/comment) to adduser in scripts.

Przemyslaw Pawelczyk
Details
Message ID
<1461410021-29808-5-git-send-email-przemoc@zoho.com>
In-Reply-To
<1461410021-29808-1-git-send-email-przemoc@zoho.com> (view parent)
Sender timestamp
1461410018
DKIM signature
missing
Download raw message
Patch: +160 -159
This way we can avoid ugly default:

    Linux user,,,
---
 community/caddy/caddy.pre-install                                    | 2 +-
 community/docker-registry/docker-registry.pre-install                | 2 +-
 community/domoticz/domoticz.pre-install                              | 2 +-
 community/icinga2/icinga2.pre-install                                | 2 +-
 community/minetest/minetest-server.pre-install                       | 2 +-
 community/oscam/oscam.pre-install                                    | 2 +-
 community/redmine/redmine.pre-install                                | 2 +-
 community/smstools/smstools.pre-install                              | 2 +-
 community/sniproxy/sniproxy.pre-install                              | 2 +-
 community/syncthing/syncthing.pre-install                            | 2 +-
 community/tvheadend/tvheadend.pre-install                            | 2 +-
 main/amavisd-new/amavisd-new.pre-install                             | 2 +-
 main/apache2/apache2.pre-install                                     | 2 +-
 main/aports-build/aports-build.pre-install                           | 2 +-
 main/arpwatch/arpwatch.pre-install                                   | 2 +-
 main/asterisk/asterisk.pre-install                                   | 2 +-
 main/asterisk/asterisk.pre-upgrade                                   | 2 +-
 main/bacula-client/bacula-client.pre-install                         | 2 +-
 main/bacula/bacula.pre-install                                       | 2 +-
 main/bind/bind.pre-install                                           | 2 +-
 main/charybdis/charybdis.pre-install                                 | 2 +-
 main/chrony/chrony.pre-install                                       | 2 +-
 main/clamav/clamav-daemon.pre-install                                | 2 +-
 main/clamav/clamav-db.pre-install                                    | 2 +-
 main/clamav/freshclam.pre-install                                    | 2 +-
 main/clamsmtp/clamsmtp.pre-install                                   | 2 +-
 main/clamsmtp/clamsmtp.pre-upgrade                                   | 2 +-
 main/coova-chilli/coova-chilli.pre-install                           | 2 +-
 main/cups/cups.pre-install                                           | 2 +-
 main/cvechecker/cvechecker.pre-install                               | 2 +-
 main/dansguardian/dansguardian.pre-install                           | 1 +
 main/darkhttpd/darkhttpd.pre-install                                 | 4 ++--
 main/dbus/dbus.pre-install                                           | 2 +-
 main/dhcp/dhcp.pre-install                                           | 2 +-
 main/distcc/distcc.pre-install                                       | 2 +-
 main/dnsmasq/dnsmasq.pre-install                                     | 2 +-
 main/dovecot/dovecot.pre-install                                     | 4 ++--
 main/ez-ipupdate/ez-ipupdate.pre-install                             | 2 +-
 main/fetchmail/fetchmail.pre-install                                 | 2 +-
 main/freeradius/freeradius.pre-install                               | 2 +-
 main/freeswitch/freeswitch.pre-install                               | 2 +-
 main/gdnsd/gdnsd.pre-install                                         | 2 +-
 main/gitolite/gitolite.pre-install                                   | 2 +-
 main/gnats/gnats.pre-install                                         | 2 +-
 main/gross/gross.pre-install                                         | 2 +-
 main/haproxy/haproxy.pre-install                                     | 2 +-
 main/haproxy/haproxy.pre-upgrade                                     | 2 +-
 main/icecast/icecast.pre-install                                     | 2 +-
 main/ircservices/ircservices.pre-install                             | 2 +-
 main/kamailio/kamailio.pre-install                                   | 2 +-
 main/lighttpd/lighttpd.pre-install                                   | 2 +-
 main/logcheck/logcheck.pre-install                                   | 2 +-
 main/mariadb/mariadb.pre-install                                     | 2 +-
 main/memcached/memcached.pre-install                                 | 2 +-
 main/mini_httpd/mini_httpd.pre-install                               | 2 +-
 main/minidlna/minidlna.pre-install                                   | 2 +-
 main/mlmmj/mlmmj.pre-install                                         | 2 +-
 main/mosquitto/mosquitto.pre-install                                 | 2 +-
 main/mpd/mpd.pre-install                                             | 2 +-
 main/nagios/nagios.pre-install                                       | 2 +-
 main/nginx-initscripts/nginx-initscripts.pre-install                 | 2 +-
 main/ngircd/ngircd.pre-install                                       | 2 +-
 main/nrpe/nrpe.pre-install                                           | 2 +-
 main/nsd/nsd.pre-install                                             | 2 +-
 main/nss-pam-ldapd/nss-pam-ldapd.pre-install                         | 2 +-
 main/ntop/ntop.pre-install                                           | 2 +-
 main/openntpd/openntpd.pre-install                                   | 2 +-
 main/opentracker/opentracker.pre-install                             | 2 +-
 main/openvpn/openvpn.pre-install                                     | 2 +-
 main/pcsc-lite/pcsc-lite.pre-install                                 | 2 +-
 main/pdnsd/pdnsd.pre-install                                         | 2 +-
 main/perdition/perdition.pre-install                                 | 2 +-
 main/postfix/postfix.pre-install                                     | 4 ++--
 main/postgrey/postgrey.pre-install                                   | 2 +-
 main/privoxy/privoxy.pre-install                                     | 2 +-
 main/quagga-nhrp/quagga-nhrp.pre-install                             | 2 +-
 main/quagga/quagga.pre-install                                       | 2 +-
 main/quassel/quassel-core.pre-install                                | 2 +-
 main/redis/redis.pre-install                                         | 2 +-
 main/rpcbind/rpcbind.pre-install                                     | 2 +-
 main/rtnppd/rtnppd.pre-install                                       | 2 +-
 main/rtpproxy/rtpproxy.pre-install                                   | 2 +-
 main/sems/sems.pre-install                                           | 2 +-
 main/sircbot/sircbot.pre-install                                     | 2 +-
 main/smokeping/smokeping.pre-install                                 | 2 +-
 main/snmptt/snmptt.pre-install                                       | 2 +-
 main/snort/snort.pre-install                                         | 2 +-
 main/squid/squid.pre-install                                         | 2 +-
 main/squid/squid.pre-upgrade                                         | 2 +-
 main/strongswan/strongswan.pre-install                               | 2 +-
 main/subversion/subversion.pre-install                               | 2 +-
 main/trac/trac.pre-install                                           | 2 +-
 main/transmission/transmission-daemon.pre-install                    | 2 +-
 main/umurmur/umurmur.post-install                                    | 2 +-
 main/uvncrepeater/uvncrepeater.pre-install                           | 2 +-
 main/varnish/varnish.pre-install                                     | 2 +-
 main/vde2/vde2.pre-install                                           | 2 +-
 main/vlc/vlc-daemon.pre-install                                      | 2 +-
 main/vsftpd/vsftpd.pre-install                                       | 2 +-
 main/ympd/ympd.pre-install                                           | 2 +-
 main/zabbix/zabbix-agent.pre-install                                 | 2 +-
 main/zabbix/zabbix.pre-install                                       | 2 +-
 main/znc/znc.pre-install                                             | 2 +-
 testing/3proxy/3proxy.pre-install                                    | 2 +-
 testing/at/at.pre-install                                            | 2 +-
 testing/clapf/clapf.pre-install                                      | 2 +-
 testing/cluster-glue/cluster-glue.pre-install                        | 2 +-
 testing/consul/consul.pre-install                                    | 2 +-
 testing/crtmpserver/crtmpserver.pre-install                          | 2 +-
 testing/dante/dante-server.pre-install                               | 2 +-
 testing/darwin-streaming-server/darwin-streaming-server.post-install | 2 +-
 testing/dbmail/dbmail.pre-install                                    | 2 +-
 testing/dnscrypt-proxy/dnscrypt-proxy.pre-install                    | 2 +-
 testing/drizzle/drizzle.post-install                                 | 2 +-
 testing/dspam/dspam.pre-install                                      | 2 +-
 testing/ejabberd/ejabberd.pre-install                                | 2 +-
 testing/fcron/fcron.pre-install                                      | 2 +-
 testing/gdnsd/gdnsd.pre-install                                      | 2 +-
 testing/gogs/gogs.pre-install                                        | 2 +-
 testing/h2o/h2o.pre-install                                          | 2 +-
 testing/knot/knot.pre-install                                        | 2 +-
 testing/lightdm/lightdm.pre-install                                  | 2 +-
 testing/lizardfs/lizardfs.pre-install                                | 2 +-
 testing/lshell/lshell.pre-install                                    | 2 +-
 testing/lusca/lusca.pre-install                                      | 2 +-
 testing/lusca/lusca.pre-upgrade                                      | 2 +-
 testing/milter-greylist/milter-greylist.pre-install                  | 2 +-
 testing/mongodb/mongodb.pre-install                                  | 2 +-
 testing/motion/motion.pre-install                                    | 2 +-
 testing/munin/munin-node.pre-install                                 | 2 +-
 testing/nginx-naxsi/nginx-naxsi.pre-install                          | 2 +-
 testing/ntopng/ntopng.pre-install                                    | 2 +-
 testing/opensips/opensips.pre-install                                | 2 +-
 testing/openxcap/openxcap.pre-install                                | 2 +-
 testing/pdns/pdns.pre-install                                        | 2 +-
 testing/qpage/qpage.pre-install                                      | 2 +-
 testing/radicale/radicale.pre-install                                | 2 +-
 testing/rancid/rancid.pre-install                                    | 2 +-
 testing/rrdbot/rrdbot.pre-install                                    | 2 +-
 testing/sipwise-sems/sipwise-sems.pre-install                        | 2 +-
 testing/socklog/socklog.post-install                                 | 2 +-
 testing/stunnel/stunnel.pre-install                                  | 2 +-
 testing/tengine/tengine.pre-install                                  | 2 +-
 testing/tengine/tengine.pre-upgrade                                  | 2 +-
 testing/thttpd/thttpd.pre-install                                    | 2 +-
 testing/tor/tor.pre-install                                          | 2 +-
 testing/tvheadend-git/tvheadend-git.pre-install                      | 2 +-
 testing/vault/vault.pre-install                                      | 2 +-
 testing/vnstat/vnstat.pre-install                                    | 2 +-
 testing/wt/wt.pre-install                                            | 2 +-
 testing/x2goserver/x2goserver.pre-install                            | 2 +-
 testing/zabbix/zabbix-agent.pre-install                              | 2 +-
 testing/zabbix/zabbix.pre-install                                    | 2 +-
 unmaintained/apache-couchdb/apache-couchdb.post-install              | 2 +-
 unmaintained/ejabberd-git/ejabberd-git.pre-install                   | 2 +-
 unmaintained/kde-workspace/kde-workspace.pre-install                 | 2 +-
 unmaintained/shadowircd/shadowircd.pre-install                       | 2 +-
 157 files changed, 160 insertions(+), 159 deletions(-)

diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index 8c67557..7bf003d 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -h /var/lib/caddy -D -s /sbin/nologin caddy 2>/dev/null
+adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
 exit 0
diff --git a/community/docker-registry/docker-registry.pre-install b/community/docker-registry/docker-registry.pre-install
index e921230..3bc3eab 100644
--- a/community/docker-registry/docker-registry.pre-install
+++ b/community/docker-registry/docker-registry.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S docker-registry 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G docker-registry docker-registry 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G docker-registry -g docker-registry docker-registry 2>/dev/null
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 8a7d12c..077e0fa 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null
+adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null
 exit 0
diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install
index 349c8c8..e84e09e 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 addgroup -S icinga 2>/dev/null
 addgroup -S icingacmd 2>/dev/null
-adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D icinga 2>/dev/null
+adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D -g icinga icinga 2>/dev/null
 adduser icinga icingacmd 2>/dev/null 2>/dev/null
 exit 0
diff --git a/community/minetest/minetest-server.pre-install b/community/minetest/minetest-server.pre-install
index dbf1411..4cde639 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null
+adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index 6f2cc9e..2f5f5d9 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -H -D -s /sbin/nologin oscam 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
 exit 0
diff --git a/community/redmine/redmine.pre-install b/community/redmine/redmine.pre-install
index f382844..072bd1d 100644
--- a/community/redmine/redmine.pre-install
+++ b/community/redmine/redmine.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D redmine 2>/dev/null
+adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D -g redmine redmine 2>/dev/null
 addgroup redmine www-data 2>/dev/null
 
 exit 0
diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index 638266c..d9e1d36 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S smsd &>/dev/null
-adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D smsd &>/dev/null
+adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd &>/dev/null
 adduser -G uucp smsd &>/dev/null
 exit 0
diff --git a/community/sniproxy/sniproxy.pre-install b/community/sniproxy/sniproxy.pre-install
index 0c6ea46..c56f31d 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S sniproxy 2>/dev/null
-adduser -S -h /var/log/sniproxy -s /bin/false -D sniproxy 2>/dev/null
+adduser -S -h /var/log/sniproxy -s /bin/false -D -g sniproxy sniproxy 2>/dev/null
 exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index dd7f389..002a54f 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null
+adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null
 exit 0
diff --git a/community/tvheadend/tvheadend.pre-install b/community/tvheadend/tvheadend.pre-install
index 0580cb5..6fee0b4 100644
--- a/community/tvheadend/tvheadend.pre-install
+++ b/community/tvheadend/tvheadend.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend tvheadend 2>/dev/null
+adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
 addgroup tvheadend usb 2>/dev/null
 exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index bd8c3a6..d0c0700 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S amavis 2>/dev/null
-adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null
+adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null
 exit 0
 
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index 81f4b06..cb80323 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null
+adduser -S -H -h /var/www -s /sbin/nologin -D -g apache apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
 exit 0
diff --git a/main/aports-build/aports-build.pre-install b/main/aports-build/aports-build.pre-install
index 21bf106..a4928eb 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -D buildozer -s /bin/sh 2>/dev/null
+adduser -S -D -g buildozer buildozer -s /bin/sh 2>/dev/null
 exit 0
diff --git a/main/arpwatch/arpwatch.pre-install b/main/arpwatch/arpwatch.pre-install
index d09fad4..d75874f 100644
--- a/main/arpwatch/arpwatch.pre-install
+++ b/main/arpwatch/arpwatch.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -H -s /sbin/nologin -D arpwatch 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null
 exit 0
 
diff --git a/main/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
index 80b7e67..935466d 100644
--- a/main/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/asterisk -s /sbin/nologin -D asterisk 2>/dev/null
+adduser -S -h /var/lib/asterisk -s /sbin/nologin -D -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 exit 0
diff --git a/main/asterisk/asterisk.pre-upgrade b/main/asterisk/asterisk.pre-upgrade
index 6c2984a..781d5d8 100644
--- a/main/asterisk/asterisk.pre-upgrade
+++ b/main/asterisk/asterisk.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/asterisk -s /bin/false -D asterisk 2>/dev/null
+adduser -S -h /var/lib/asterisk -s /bin/false -D -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 0eb2cab..7827de6 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null
+adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
 exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 0eb2cab..7827de6 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null
+adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
 exit 0
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 3770738..116d51e 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S named 2>/dev/null
-adduser -S -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null
+adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null
 exit 0
 
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
index 3c120d3..83ffff3 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/run/charybdis -s /sbin/nologin -D ircd 2>/dev/null
+adduser -S -h /var/run/charybdis -s /sbin/nologin -D -g ircd ircd 2>/dev/null
 exit 0
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
index 83c4560..41e01c6 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S chrony 2>/dev/null
-adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D chrony 2>/dev/null
+adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D -g chrony chrony 2>/dev/null
 exit 0
diff --git a/main/clamav/clamav-daemon.pre-install b/main/clamav/clamav-daemon.pre-install
index 4528fbb..5ef833a 100644
--- a/main/clamav/clamav-daemon.pre-install
+++ b/main/clamav/clamav-daemon.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S clamav 2>/dev/null
-adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav clamav 2>/dev/null
+adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index 9bc70dd..f46eabe 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamav/freshclam.pre-install b/main/clamav/freshclam.pre-install
index 4528fbb..5ef833a 100644
--- a/main/clamav/freshclam.pre-install
+++ b/main/clamav/freshclam.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S clamav 2>/dev/null
-adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav clamav 2>/dev/null
+adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install
index 9bc70dd..f46eabe 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index 7e736a2..c673e27 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -10,5 +10,5 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 	echo " *"
 fi
 
-adduser -S -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
index 6ef8741..15de617 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -H -s /sbin/nologin -D chilli 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g chilli chilli 2>/dev/null
 exit 0
 
diff --git a/main/cups/cups.pre-install b/main/cups/cups.pre-install
index 468163c..4b099d8 100644
--- a/main/cups/cups.pre-install
+++ b/main/cups/cups.pre-install
@@ -2,6 +2,6 @@
 
 addgroup -S lpadmin 2>/dev/null
 addgroup -S lp 2>/dev/null
-adduser -S -G lp lp 2>/dev/null
+adduser -S -G lp -g lp lp 2>/dev/null
 addgroup lp lp 2>/dev/null
 exit 0
diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install
index cf6b144..b698117 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 addgroup -S cvechecker &>/dev/null
-adduser -S cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
+adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
diff --git a/main/dansguardian/dansguardian.pre-install b/main/dansguardian/dansguardian.pre-install
index f5c8bbf..e897f8c 100644
--- a/main/dansguardian/dansguardian.pre-install
+++ b/main/dansguardian/dansguardian.pre-install
@@ -5,5 +5,6 @@ adduser -S -D -H \
 	-h /var/log/dansguardian \
 	-s /sbin/nologin \
 	-G dansguar \
+	-g dansguar \
 	dansguar 2>/dev/null || true
 
diff --git a/main/darkhttpd/darkhttpd.pre-install b/main/darkhttpd/darkhttpd.pre-install
index 80cfa6b..b189233 100644
--- a/main/darkhttpd/darkhttpd.pre-install
+++ b/main/darkhttpd/darkhttpd.pre-install
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D darkhttpd \
-	2>/dev/null
+adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -g darkhttpd \
+	darkhttpd 2>/dev/null
 addgroup darkhttpd www-data 2>/dev/null
 
 exit 0
diff --git a/main/dbus/dbus.pre-install b/main/dbus/dbus.pre-install
index 57f9f54..7fdb08a 100644
--- a/main/dbus/dbus.pre-install
+++ b/main/dbus/dbus.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S messagebus 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D messagebus -G messagebus 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g messagebus messagebus -G messagebus 2>/dev/null
 exit 0
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 27fa93f..5aaa6c4 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null
+adduser -S -h /var/lib/dhcp -s /sbin/nologin -D -g dhcp dhcp 2>/dev/null
 exit 0
 
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index b07f846..b408b4a 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S distcc 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D -g distcc distcc 2>/dev/null
 exit 0
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 3e9e4b0..43f60b8 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S dnsmasq 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D dnsmasq 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D -g dnsmasq dnsmasq 2>/dev/null
 exit 0
diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index 58346c6..481132b 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D dovecot 2>/dev/null
-adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null
+adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D -g dovecot dovecot 2>/dev/null
+adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D -g dovenull dovenull 2>/dev/null
 exit 0
diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install
index 064e418..23d9fae 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null
+adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D -g ipupdate ipupdate 2>/dev/null
 exit 0
 
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index 2961b9a..67681f8 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null
+adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D -g fetchmail fetchmail 2>/dev/null
 exit 0
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index b81e86d..f02c2c0 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S radius 2>/dev/null
-adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D radius 2>/dev/null
+adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -g radius radius 2>/dev/null
 exit 0
 
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
index 4dccd57..f175cd3 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null
+adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D -g freeswitch freeswitch 2>/dev/null
 
 exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index 2479466..040e7f1 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S gdnsd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
 exit 0
diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install
index fbb1e2a..2d155ab 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null
+adduser -S -H -h /var/lib/git -s /bin/sh -D -g git git 2>/dev/null
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 849841f..81093a4 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gnatsdb -D gnats 2>/dev/null
+adduser -S -h /var/lib/gnatsdb -D -g gnats gnats 2>/dev/null
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index f79e657..d3a5f85 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -s /sbin/nologin -D gross 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g gross gross 2>/dev/null
 exit 0
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 4706956..72b8ab0 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -2,7 +2,7 @@
 
 addgroup -S haproxy 2>/dev/null
 adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
-	-G haproxy haproxy 2>/dev/null
+	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
 if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 4706956..72b8ab0 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
@@ -2,7 +2,7 @@
 
 addgroup -S haproxy 2>/dev/null
 adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
-	-G haproxy haproxy 2>/dev/null
+	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
 if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index 9978a4b..8734c1e 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/log/icecast -s /sbin/nologin -D icecast  2>/dev/null
+adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast  2>/dev/null
 
 exit 0
diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install
index 5016c89..4f6144a 100644
--- a/main/ircservices/ircservices.pre-install
+++ b/main/ircservices/ircservices.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/ircservices -s /sbin/nologin -D ircservices 2>/dev/null
+adduser -S -h /var/lib/ircservices -s /sbin/nologin -D -g ircservices ircservices 2>/dev/null
 exit 0
 
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index fd7b13e..19d11f5 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S kamailio 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio  2>/dev/null
 
 exit 0
diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install
index 2349478..80f2562 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null
+adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -g lighttpd lighttpd 2>/dev/null
 addgroup lighttpd www-data 2>/dev/null
 
 exit 0
diff --git a/main/logcheck/logcheck.pre-install b/main/logcheck/logcheck.pre-install
index b0f2a83..ea6028c 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S logcheck 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck logcheck 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck -g logcheck logcheck 2>/dev/null
 exit 0
diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install
index 5b68b1e..e4f16d2 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mysql 2>/dev/null
-adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D mysql 2>/dev/null
+adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D -g mysql mysql 2>/dev/null
 exit 0
 
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index 6612df9..df22cd5 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D memcached 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g memcached memcached 2>/dev/null
 exit 0
 
diff --git a/main/mini_httpd/mini_httpd.pre-install b/main/mini_httpd/mini_httpd.pre-install
index 3b5258a..63876f7 100644
--- a/main/mini_httpd/mini_httpd.pre-install
+++ b/main/mini_httpd/mini_httpd.pre-install
@@ -9,7 +9,7 @@ fi
 
 addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-        -D minihttpd 2>/dev/null
+        -D -g minihttpd minihttpd 2>/dev/null
 addgroup minihttpd www-data 2>/dev/null
 
 exit 0
diff --git a/main/minidlna/minidlna.pre-install b/main/minidlna/minidlna.pre-install
index 78fb2d4..4423a73 100644
--- a/main/minidlna/minidlna.pre-install
+++ b/main/minidlna/minidlna.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S minidlna 2>/dev/null
 adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -G minidlna \
-	minidlna 2>/dev/null
+	-g minidlna minidlna 2>/dev/null
 exit 0
diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install
index 38b8fb8..046a821 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S mlmmj 2>/dev/null
-adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj mlmmj 2>/dev/null
+adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj -g mlmmj mlmmj 2>/dev/null
 exit 0
diff --git a/main/mosquitto/mosquitto.pre-install b/main/mosquitto/mosquitto.pre-install
index 026fe2c..a0a8f72 100644
--- a/main/mosquitto/mosquitto.pre-install
+++ b/main/mosquitto/mosquitto.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S mosquitto 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto mosquitto 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto -g mosquitto mosquitto 2>/dev/null
 exit 0
diff --git a/main/mpd/mpd.pre-install b/main/mpd/mpd.pre-install
index 70bddb2..7e012f8 100644
--- a/main/mpd/mpd.pre-install
+++ b/main/mpd/mpd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D mpd 2>/dev/null || true
+adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null || true
diff --git a/main/nagios/nagios.pre-install b/main/nagios/nagios.pre-install
index dad8a0e..d9c0f3c 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S nagios 2>/dev/null
-adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin nagios 2>/dev/null
+adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin -g nagios nagios 2>/dev/null
 exit 0
diff --git a/main/nginx-initscripts/nginx-initscripts.pre-install b/main/nginx-initscripts/nginx-initscripts.pre-install
index 63db1e9..00bd0de 100644
--- a/main/nginx-initscripts/nginx-initscripts.pre-install
+++ b/main/nginx-initscripts/nginx-initscripts.pre-install
@@ -3,7 +3,7 @@
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
 adduser -S -G nginx -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-	-D nginx 2>/dev/null
+	-D -g nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0
diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index 5c8d34b..036c9ab 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null
+adduser -S -H -h /etc/ngircd -s /sbin/nologin -D -g ngircd ngircd 2>/dev/null
 exit 0
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index a9a0d38..7ee629b 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g nagios nagios 2>/dev/null
 addgroup -S nagios 2>/dev/null
 exit 0
diff --git a/main/nsd/nsd.pre-install b/main/nsd/nsd.pre-install
index 7f92eca..106ac00 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S nsd 2>/dev/null
-adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin nsd 2>/dev/null
+adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin -g nsd nsd 2>/dev/null
 exit 0
diff --git a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
index 5d30b9c..5a7076f 100644
--- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
+++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
@@ -5,5 +5,5 @@ groupname=$username
 
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
-	$username 2>/dev/null
+	-g $username $username 2>/dev/null
 exit 0
diff --git a/main/ntop/ntop.pre-install b/main/ntop/ntop.pre-install
index e22ff3e..2386dc8 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S ntop 2>/dev/null
-adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null
+adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
 exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index feb5d9c..997e7bf 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -S -H -h /var/empty -s /sbin/nologin -D ntp  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp  2>/dev/null
 
 exit 0
diff --git a/main/opentracker/opentracker.pre-install b/main/opentracker/opentracker.pre-install
index 8d619f6..2e591db 100644
--- a/main/opentracker/opentracker.pre-install
+++ b/main/opentracker/opentracker.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/empty -s /sbin/false opentracker 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/false -g opentracker opentracker 2>/dev/null
 exit 0
 
diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install
index 0f39d06..37e0bf2 100644
--- a/main/openvpn/openvpn.pre-install
+++ b/main/openvpn/openvpn.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S openvpn 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn openvpn 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn -g openvpn openvpn 2>/dev/null
 exit 0
diff --git a/main/pcsc-lite/pcsc-lite.pre-install b/main/pcsc-lite/pcsc-lite.pre-install
index 1c1ba3c..192e10e 100644
--- a/main/pcsc-lite/pcsc-lite.pre-install
+++ b/main/pcsc-lite/pcsc-lite.pre-install
@@ -5,5 +5,5 @@ groupname=$username
 
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
-	$username 2>/dev/null
+	-g $username $username 2>/dev/null
 exit 0
diff --git a/main/pdnsd/pdnsd.pre-install b/main/pdnsd/pdnsd.pre-install
index 247928c..b916dab 100644
--- a/main/pdnsd/pdnsd.pre-install
+++ b/main/pdnsd/pdnsd.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin pdnsd 2>/dev/null
+adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin -g pdnsd pdnsd 2>/dev/null
 exit 0
diff --git a/main/perdition/perdition.pre-install b/main/perdition/perdition.pre-install
index 5d9148f..1c0b01e 100644
--- a/main/perdition/perdition.pre-install
+++ b/main/perdition/perdition.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S perdition 2>/dev/null
-adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D perdition 2>/dev/null
+adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D -g perdition perdition 2>/dev/null
 
 exit 0
diff --git a/main/postfix/postfix.pre-install b/main/postfix/postfix.pre-install
index c3fc668..6a59570 100644
--- a/main/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
@@ -2,9 +2,9 @@
 
 addgroup -S postfix 2>/dev/null
 addgroup -S postdrop 2>/dev/null
-adduser -S -h /var/spool/postfix -G postfix postfix 2>/dev/null
+adduser -S -h /var/spool/postfix -G postfix -g postfix postfix 2>/dev/null
 addgroup postfix mail 2>/dev/null
-adduser -S -H -s /sbin/nologin -h /var/mail/domains -G postdrop vmail 2>/dev/null
+adduser -S -H -s /sbin/nologin -h /var/mail/domains -G postdrop -g vmail vmail 2>/dev/null
 
 
 exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index 480391c..e745acf 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 -H -h /dev/null -s /sbin/nologin -D postgrey  2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g postgrey postgrey  2>/dev/null
 
 exit 0
diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install
index 72a917e..72b4ac1 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S privoxy 2>/dev/null
-adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D privoxy 2>/dev/null
+adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D -g privoxy privoxy 2>/dev/null
 exit 0
 
diff --git a/main/quagga-nhrp/quagga-nhrp.pre-install b/main/quagga-nhrp/quagga-nhrp.pre-install
index c0fe3c8..f8340fa 100644
--- a/main/quagga-nhrp/quagga-nhrp.pre-install
+++ b/main/quagga-nhrp/quagga-nhrp.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S quagga 2>/dev/null
-adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga quagga 2>/dev/null
+adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
 exit 0
 
diff --git a/main/quagga/quagga.pre-install b/main/quagga/quagga.pre-install
index c0fe3c8..f8340fa 100644
--- a/main/quagga/quagga.pre-install
+++ b/main/quagga/quagga.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S quagga 2>/dev/null
-adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga quagga 2>/dev/null
+adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
 exit 0
 
diff --git a/main/quassel/quassel-core.pre-install b/main/quassel/quassel-core.pre-install
index 66572a1..01ec63d 100644
--- a/main/quassel/quassel-core.pre-install
+++ b/main/quassel/quassel-core.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/quassel -s /sbin/nologin -D quassel 2>/dev/null
+adduser -S -h /var/lib/quassel -s /sbin/nologin -D -g quassel quassel 2>/dev/null
 addgroup -S quassel 2>/dev/null
 addgroup quassel quassel
 
diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install
index 479434e..2a59934 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S redis 2>/dev/null
-adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis redis 2>/dev/null
+adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis -g redis redis 2>/dev/null
 exit 0
diff --git a/main/rpcbind/rpcbind.pre-install b/main/rpcbind/rpcbind.pre-install
index 8db3128..51fae45 100644
--- a/main/rpcbind/rpcbind.pre-install
+++ b/main/rpcbind/rpcbind.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S rpc 2>/dev/null
-adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc rpc 2>/dev/null
+adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc -g rpc rpc 2>/dev/null
 exit 0
diff --git a/main/rtnppd/rtnppd.pre-install b/main/rtnppd/rtnppd.pre-install
index ec2c922..faf0431 100644
--- a/main/rtnppd/rtnppd.pre-install
+++ b/main/rtnppd/rtnppd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S rtnppd 2>/dev/null
-adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin rtnppd 2>/dev/null
+adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin -g rtnppd rtnppd 2>/dev/null
 exit 0
diff --git a/main/rtpproxy/rtpproxy.pre-install b/main/rtpproxy/rtpproxy.pre-install
index d4ca593..cbf1e52 100644
--- a/main/rtpproxy/rtpproxy.pre-install
+++ b/main/rtpproxy/rtpproxy.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S rtpproxy 2>/dev/null
-adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin rtpproxy 2>/dev/null
+adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin -g rtpproxy rtpproxy 2>/dev/null
 exit 0
diff --git a/main/sems/sems.pre-install b/main/sems/sems.pre-install
index 6241566..b3b5c78 100644
--- a/main/sems/sems.pre-install
+++ b/main/sems/sems.pre-install
@@ -4,7 +4,7 @@ if ! getent group sems >/dev/null; then
 	addgroup -S sems
 fi
 if ! getent passwd sems >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems sems 2>/dev/null
+	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
 fi
 
 exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index 453ba5d..8bfedcc 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S sircbot 2>/dev/null
-adduser -S -h /var/run/sircbot -G sircbot -D sircbot 2>/dev/null
+adduser -S -h /var/run/sircbot -G sircbot -D -g sircbot sircbot 2>/dev/null
 exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index 8934148..3158cc4 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S smokeping 2>/dev/null
-adduser -S -h /var/lib/smokeping -D -G smokeping smokeping 2>/dev/null
+adduser -S -h /var/lib/smokeping -D -G smokeping -g smokeping smokeping 2>/dev/null
 exit 0
diff --git a/main/snmptt/snmptt.pre-install b/main/snmptt/snmptt.pre-install
index 6619337..efc8a6e 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/spool/snmptt -s /sbin/nologin -D snmptt &>/dev/null
+adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt &>/dev/null
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index c8bf706..47608ed 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null
+adduser -S -h /var/log/snort -s /sbin/nologin -D -g snort snort 2>/dev/null
 exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index b51ade1..3ac1f9f 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D squid -H /var/cache/squid  2>/dev/null
+adduser -S -D -g squid squid -H /var/cache/squid  2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index b51ade1..3ac1f9f 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D squid -H /var/cache/squid  2>/dev/null
+adduser -S -D -g squid squid -H /var/cache/squid  2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0
diff --git a/main/strongswan/strongswan.pre-install b/main/strongswan/strongswan.pre-install
index e1fa319..12371d1 100644
--- a/main/strongswan/strongswan.pre-install
+++ b/main/strongswan/strongswan.pre-install
@@ -4,7 +4,7 @@ if ! getent group ipsec >/dev/null; then
 	addgroup -S ipsec
 fi
 if ! getent passwd ipsec >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec ipsec 2>/dev/null
+	adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec -g ipsec ipsec 2>/dev/null
 fi
 
 exit 0
diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index ddec16c..3109006 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S svnusers 2>/dev/null
-adduser -S svn -D -h /var/svn -G svnusers 2>/dev/null
+adduser -S -g svn svn -D -h /var/svn -G svnusers 2>/dev/null
 exit 0
 
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install
index f39f2b2..0fa8f02 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S tracd 2>/dev/null
-adduser -S -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
+adduser -S -s /sbin/nologin -G tracd -D -H -g tracd tracd 2>/dev/null
 exit 0
diff --git a/main/transmission/transmission-daemon.pre-install b/main/transmission/transmission-daemon.pre-install
index 2f9a398..9ccac8c 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null
+adduser -S -h /var/lib/transmission -s /sbin/nologin -D -g transmission transmission 2>/dev/null
 
 exit 0
diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index 9d5f408..d9a350a 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S umurmur &>/dev/null
-adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D umurmur &>/dev/null
+adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur &>/dev/null
 exit 0
diff --git a/main/uvncrepeater/uvncrepeater.pre-install b/main/uvncrepeater/uvncrepeater.pre-install
index a1126c6..0c856f8 100644
--- a/main/uvncrepeater/uvncrepeater.pre-install
+++ b/main/uvncrepeater/uvncrepeater.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -D uvncrep 2>/dev/null
+adduser -S -D -g uvncrep uvncrep 2>/dev/null
 exit 0
 
diff --git a/main/varnish/varnish.pre-install b/main/varnish/varnish.pre-install
index 930d46b..74ccfd1 100644
--- a/main/varnish/varnish.pre-install
+++ b/main/varnish/varnish.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S varnish 2>/dev/null
-adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish varnish 2>/dev/null
+adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish -g varnish varnish 2>/dev/null
 exit 0
diff --git a/main/vde2/vde2.pre-install b/main/vde2/vde2.pre-install
index bb5037c..0e42350 100644
--- a/main/vde2/vde2.pre-install
+++ b/main/vde2/vde2.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S vde2-net 2>/dev/null
-adduser -S -h /var/run/vde2 -s /sbin/nologin -G vde2-net -D -H vde2-net 2>/dev/null
+adduser -S -h /var/run/vde2 -s /sbin/nologin -G vde2-net -D -H -g vde2-net vde2-net 2>/dev/null
 
 exit 0
diff --git a/main/vlc/vlc-daemon.pre-install b/main/vlc/vlc-daemon.pre-install
index 72ee1b7..33f99df 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
@@ -4,7 +4,7 @@ groups="vlc audio video"
 for group in $groups; do
 	addgroup -S $group 2>/dev/null
 done
-adduser -S -h /home/vlc -s /bin/sh -G vlc -D vlc 2>/dev/null
+adduser -S -h /home/vlc -s /bin/sh -G vlc -D -g vlc vlc 2>/dev/null
 
 # make sure vlc are in all groups
 for group in $groups; do
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index 200d233..0ed59d9 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S ftp &>/dev/null
 addgroup vsftp ftp &>/dev/null
-adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp vsftp &>/dev/null
+adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp &>/dev/null
 exit 0
diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install
index 1bbd045..369f25d 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -D -s /sbin/nologin -G audio ympd 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -G audio -g ympd ympd 2>/dev/null
 exit 0
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
index 91ea88c..a63d884 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 addgroup -g 30 zabbix 2>/dev/null
 exit 0
diff --git a/main/zabbix/zabbix.pre-install b/main/zabbix/zabbix.pre-install
index 19d6469..30851f1 100644
--- a/main/zabbix/zabbix.pre-install
+++ b/main/zabbix/zabbix.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 exit 0
diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index ad5aed9..c0e1fa5 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -D -s /sbin/nologin znc 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -g znc znc 2>/dev/null
 exit 0
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index dbfa438..46e6ea5 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S 3proxy 2>/dev/null
-adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D 3proxy 2>/dev/null
+adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -g 3proxy 3proxy 2>/dev/null
 exit 0
 
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index 5372277..a35aa48 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -5,7 +5,7 @@ if ! getent group at >/dev/null; then
 fi
 
 if ! getent passwd at >/dev/null; then
-	adduser -S -H -s /bin/false -D at 2>/dev/null
+	adduser -S -H -s /bin/false -D -g at at 2>/dev/null
 fi
 
 if [ -z `echo " $(groups at) " | grep ' at '`] ; then
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index bf78879..dff8c72 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
 exit 0
diff --git a/testing/cluster-glue/cluster-glue.pre-install b/testing/cluster-glue/cluster-glue.pre-install
index 056fbde..2dff6b2 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S haclient 2>/dev/null
-adduser -S hacluster \
+adduser -S -g hacluster hacluster \
 	-h /var/lib/heartbeat/cores/hacluster \
 	-G haclient \
 	-s /sbin/nologin \
diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install
index 6e11c5b..4d7a385 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
@@ -2,6 +2,6 @@
 
 # Create consul group and user
 addgroup -S consul 2> /dev/null
-adduser -S -h /var/consul -s /sbin/nologin -G consul -D consul 2> /dev/null
+adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2> /dev/null
 exit 0
 
diff --git a/testing/crtmpserver/crtmpserver.pre-install b/testing/crtmpserver/crtmpserver.pre-install
index 025170a..643a6f8 100644
--- a/testing/crtmpserver/crtmpserver.pre-install
+++ b/testing/crtmpserver/crtmpserver.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/crtmpserver -s /bin/false rtmpd 2>/dev/null
+adduser -S -h /var/crtmpserver -s /bin/false -g rtmpd rtmpd 2>/dev/null
 exit 0
diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install
index f245d67..f657308 100644
--- a/testing/dante/dante-server.pre-install
+++ b/testing/dante/dante-server.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S sockd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd sockd 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd -g sockd sockd 2>/dev/null
 exit 0
diff --git a/testing/darwin-streaming-server/darwin-streaming-server.post-install b/testing/darwin-streaming-server/darwin-streaming-server.post-install
index 607ec15..005bd35 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S qtss &>/dev/null
-adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D qtss &>/dev/null
+adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss &>/dev/null
 exit 0
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index aa19b67..1f650df 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -s /bin/false -D -H -h /var/lib/dbmail dbmail 2>/dev/null
+adduser -S -s /bin/false -D -H -h /var/lib/dbmail -g dbmail dbmail 2>/dev/null
 exit 0
 
diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
index 49c4ce6..3bee7f2 100644
--- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
+++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S dnscrypt 2>/dev/null
-adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin dnscrypt 2>/dev/null
+adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin -g dnscrypt dnscrypt 2>/dev/null
 exit 0
diff --git a/testing/drizzle/drizzle.post-install b/testing/drizzle/drizzle.post-install
index effba7b..e7c7dcb 100644
--- a/testing/drizzle/drizzle.post-install
+++ b/testing/drizzle/drizzle.post-install
@@ -1,2 +1,2 @@
 addgroup -S drizzle
-adduser -SDHG drizzle drizzle
+adduser -SDHG drizzle -g drizzle drizzle
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index 2eb8940..d06ab90 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
+adduser -S -h /var/lib/dspam -s /bin/false -D -g dspam dspam 2>/dev/null
 chown dspam:dspam /var/lib/dspam
 exit 0
 
diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index 6d80151..d4cab3c 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd  2>/dev/null
 exit 0
diff --git a/testing/fcron/fcron.pre-install b/testing/fcron/fcron.pre-install
index 98f7bf1..d513ffd 100644
--- a/testing/fcron/fcron.pre-install
+++ b/testing/fcron/fcron.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -D fcron -H -s /sbin/nologin  2>/dev/null
+adduser -S -D -g fcron fcron -H -s /sbin/nologin  2>/dev/null
 addgroup -S fcron
 exit 0
diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
index 2479466..040e7f1 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S gdnsd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
 exit 0
diff --git a/testing/gogs/gogs.pre-install b/testing/gogs/gogs.pre-install
index 981a379..1596d65 100644
--- a/testing/gogs/gogs.pre-install
+++ b/testing/gogs/gogs.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D gogs 2>/dev/null || true
+adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null || true
 passwd -u gogs || true
diff --git a/testing/h2o/h2o.pre-install b/testing/h2o/h2o.pre-install
index 358f4a2..92631f1 100644
--- a/testing/h2o/h2o.pre-install
+++ b/testing/h2o/h2o.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -s /sbin/nologin -h /var/www -D -H h2o 2>/dev/null 
+adduser -S -s /sbin/nologin -h /var/www -D -H -g h2o h2o 2>/dev/null 
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup h2o www-data 2>/dev/null
 
diff --git a/testing/knot/knot.pre-install b/testing/knot/knot.pre-install
index 82be3a6..60789de 100644
--- a/testing/knot/knot.pre-install
+++ b/testing/knot/knot.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S knot 2>/dev/null
-adduser -S -s /sbin/nologin -G knot -D -H knot 2>/dev/null
+adduser -S -s /sbin/nologin -G knot -D -H -g knot knot 2>/dev/null
 
 exit 0
diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install
index 7a5fefe..b8dbf56 100644
--- a/testing/lightdm/lightdm.pre-install
+++ b/testing/lightdm/lightdm.pre-install
@@ -2,5 +2,5 @@
 
 name=lightdm
 addgroup -S $name 2>/dev/null
-adduser -S -H -h /var/run/lightdm -s /bin/false -D -G $name $name 2>/dev/null
+adduser -S -H -h /var/run/lightdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
 exit 0
diff --git a/testing/lizardfs/lizardfs.pre-install b/testing/lizardfs/lizardfs.pre-install
index 33821a2..f302e85 100644
--- a/testing/lizardfs/lizardfs.pre-install
+++ b/testing/lizardfs/lizardfs.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mfs 2>/dev/null
-adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs mfs \
+adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs -g mfs mfs \
 	2>/dev/null
 exit 0
diff --git a/testing/lshell/lshell.pre-install b/testing/lshell/lshell.pre-install
index 64ed203..89e31b2 100644
--- a/testing/lshell/lshell.pre-install
+++ b/testing/lshell/lshell.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S lshell 2>/dev/null
-adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin lshell 2>/dev/null
+adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin -g lshell lshell 2>/dev/null
 exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 7679028..72953cf 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup lusca winbind
 exit 0
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index 7679028..72953cf 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup lusca winbind
 exit 0
diff --git a/testing/milter-greylist/milter-greylist.pre-install b/testing/milter-greylist/milter-greylist.pre-install
index 06b94b4..f5e5359 100644
--- a/testing/milter-greylist/milter-greylist.pre-install
+++ b/testing/milter-greylist/milter-greylist.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S smmsp &>/dev/null
-adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp smmsp &>/dev/null
+adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp &>/dev/null
 exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 432d983..93c85ec 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S mongodb
-adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb
 exit 0
diff --git a/testing/motion/motion.pre-install b/testing/motion/motion.pre-install
index f4ff0d9..7e66ab0 100644
--- a/testing/motion/motion.pre-install
+++ b/testing/motion/motion.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 addgroup -S motion 2>/dev/null
-adduser -S -h /home/motion -s /bin/false -G motion -D motion 2>/dev/null
+adduser -S -h /home/motion -s /bin/false -G motion -D -g motion motion 2>/dev/null
 addgroup motion video
 exit 0
 
diff --git a/testing/munin/munin-node.pre-install b/testing/munin/munin-node.pre-install
index 86c601a..0680267 100644
--- a/testing/munin/munin-node.pre-install
+++ b/testing/munin/munin-node.pre-install
@@ -5,6 +5,6 @@ groupname="$username"
 
 addgroup -S "$username" 2>/dev/null
 adduser -S -H -h /run/"$username" -s /sbin/nologin -D -G "$groupname" \
-	"$username" 2>/dev/null
+	-g "$username" "$username" 2>/dev/null
 
 exit 0
diff --git a/testing/nginx-naxsi/nginx-naxsi.pre-install b/testing/nginx-naxsi/nginx-naxsi.pre-install
index 63db1e9..00bd0de 100644
--- a/testing/nginx-naxsi/nginx-naxsi.pre-install
+++ b/testing/nginx-naxsi/nginx-naxsi.pre-install
@@ -3,7 +3,7 @@
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
 adduser -S -G nginx -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-	-D nginx 2>/dev/null
+	-D -g nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0
diff --git a/testing/ntopng/ntopng.pre-install b/testing/ntopng/ntopng.pre-install
index e22ff3e..2386dc8 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S ntop 2>/dev/null
-adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null
+adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
 exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 5da9a0e..9ef4702 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/empty -s /bin/false -D opensips  2>/dev/null
+adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips  2>/dev/null
 
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index 0323113..44ad106 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S openxcap 2>/dev/null
-adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H openxcap 2>/dev/null
+adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H -g openxcap openxcap 2>/dev/null
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index 2565d49..e0b3c5a 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /var/empty -D -s /bin/false pdns 2>/dev/null
+adduser -S -H -h /var/empty -D -s /bin/false -g pdns pdns 2>/dev/null
 exit 0
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index 160fc0b..aaa8d3e 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D qpage 2>/dev/null || true
+adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null || true
diff --git a/testing/radicale/radicale.pre-install b/testing/radicale/radicale.pre-install
index 1145005..f101c38 100644
--- a/testing/radicale/radicale.pre-install
+++ b/testing/radicale/radicale.pre-install
@@ -2,6 +2,6 @@
 
 name=radicale
 addgroup -S $name 2>/dev/null
-adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -G $name $name 2>/dev/null
+adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -G $name -g $name $name 2>/dev/null
 addgroup $name $name 2>/dev/null
 exit 0
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index 55691b2..7204ea3 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S netadm 2>/dev/null
-adduser -S -h /var/rancid -s /bin/sh -G netadm -D rancid 2>/dev/null
+adduser -S -h /var/rancid -s /bin/sh -G netadm -D -g rancid rancid 2>/dev/null
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index ab339f8..291f918 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -S -H -s /bin/false -D rrdbotd  2>/dev/null
+adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd  2>/dev/null
 
 exit 0
diff --git a/testing/sipwise-sems/sipwise-sems.pre-install b/testing/sipwise-sems/sipwise-sems.pre-install
index 6241566..b3b5c78 100644
--- a/testing/sipwise-sems/sipwise-sems.pre-install
+++ b/testing/sipwise-sems/sipwise-sems.pre-install
@@ -4,7 +4,7 @@ if ! getent group sems >/dev/null; then
 	addgroup -S sems
 fi
 if ! getent passwd sems >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems sems 2>/dev/null
+	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
 fi
 
 exit 0
diff --git a/testing/socklog/socklog.post-install b/testing/socklog/socklog.post-install
index 9cfa37f..3f1b8a3 100644
--- a/testing/socklog/socklog.post-install
+++ b/testing/socklog/socklog.post-install
@@ -3,7 +3,7 @@
 # Copyright 2015 Stuart Cardall (developer@it-offshore.co.uk)
 # Distributed under the terms of the GNU General Public License, v2 or later #
 
-adduser -S -H -h /var/empty -D -s /sbin/nologin log 2>/dev/null
+adduser -S -H -h /var/empty -D -s /sbin/nologin -g log log 2>/dev/null
 if [ ! -d /etc/sv/socklog-unix ]; then
 	socklog-conf unix nobody log
 	mkdir -p /etc/service
diff --git a/testing/stunnel/stunnel.pre-install b/testing/stunnel/stunnel.pre-install
index 2631cc4..cfb5805 100644
--- a/testing/stunnel/stunnel.pre-install
+++ b/testing/stunnel/stunnel.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S stunnel 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel stunnel 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel -g stunnel stunnel 2>/dev/null
 exit 0
diff --git a/testing/tengine/tengine.pre-install b/testing/tengine/tengine.pre-install
index 5e32855..5a3d4b1 100644
--- a/testing/tengine/tengine.pre-install
+++ b/testing/tengine/tengine.pre-install
@@ -3,7 +3,7 @@
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S tengine 2>/dev/null
 adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-	-D tengine 2>/dev/null
+	-D -g tengine tengine 2>/dev/null
 addgroup tengine www-data 2>/dev/null
 
 exit 0
diff --git a/testing/tengine/tengine.pre-upgrade b/testing/tengine/tengine.pre-upgrade
index 5e32855..5a3d4b1 100644
--- a/testing/tengine/tengine.pre-upgrade
+++ b/testing/tengine/tengine.pre-upgrade
@@ -3,7 +3,7 @@
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S tengine 2>/dev/null
 adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-	-D tengine 2>/dev/null
+	-D -g tengine tengine 2>/dev/null
 addgroup tengine www-data 2>/dev/null
 
 exit 0
diff --git a/testing/thttpd/thttpd.pre-install b/testing/thttpd/thttpd.pre-install
index 104f72b..c2ccfb7 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-        -D thttpd 2>/dev/null
+        -D -g thttpd thttpd 2>/dev/null
 addgroup thttpd www-data 2>/dev/null
diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install
index 9db7ac8..2353635 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -h /var/run/tor -s /sbin/nologin -D tor 2>/dev/null
+adduser -S -h /var/run/tor -s /sbin/nologin -D -g tor tor 2>/dev/null
 exit 0
 
diff --git a/testing/tvheadend-git/tvheadend-git.pre-install b/testing/tvheadend-git/tvheadend-git.pre-install
index 237161e..84ca2f8 100644
--- a/testing/tvheadend-git/tvheadend-git.pre-install
+++ b/testing/tvheadend-git/tvheadend-git.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend tvheadend 2>/dev/null
+adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
 adduser tvheadend video
 exit 0
diff --git a/testing/vault/vault.pre-install b/testing/vault/vault.pre-install
index 93ce40b..60d449f 100644
--- a/testing/vault/vault.pre-install
+++ b/testing/vault/vault.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S vault 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault vault 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault -g vault vault 2>/dev/null
 exit 0
diff --git a/testing/vnstat/vnstat.pre-install b/testing/vnstat/vnstat.pre-install
index 4cb61f2..9445d10 100644
--- a/testing/vnstat/vnstat.pre-install
+++ b/testing/vnstat/vnstat.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S vnstat 2>/dev/null
-adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat vnstat 2>/dev/null
+adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat -g vnstat vnstat 2>/dev/null
 exit 0
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index e4478b2..849322d 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -s /sbin/nologin -D wt 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g wt wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
 exit 0
diff --git a/testing/x2goserver/x2goserver.pre-install b/testing/x2goserver/x2goserver.pre-install
index db97192..911390e 100755
--- a/testing/x2goserver/x2goserver.pre-install
+++ b/testing/x2goserver/x2goserver.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 addgroup -S x2gouser
-adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false x2gouser
+adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
index 3e42ff0..3ec8ae7 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 addgroup -S -g 30 zabbix 2>/dev/null
 exit 0
diff --git a/testing/zabbix/zabbix.pre-install b/testing/zabbix/zabbix.pre-install
index 19d6469..30851f1 100644
--- a/testing/zabbix/zabbix.pre-install
+++ b/testing/zabbix/zabbix.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 exit 0
diff --git a/unmaintained/apache-couchdb/apache-couchdb.post-install b/unmaintained/apache-couchdb/apache-couchdb.post-install
index 4d3b841..4bf99a4 100755
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ b/unmaintained/apache-couchdb/apache-couchdb.post-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S couchdb &>/dev/null
-adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D couchdb &>/dev/null
+adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -g couchdb couchdb &>/dev/null
 exit 0
diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install
index 6d80151..d4cab3c 100644
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd  2>/dev/null
 exit 0
diff --git a/unmaintained/kde-workspace/kde-workspace.pre-install b/unmaintained/kde-workspace/kde-workspace.pre-install
index 84921ba..ef2e671 100644
--- a/unmaintained/kde-workspace/kde-workspace.pre-install
+++ b/unmaintained/kde-workspace/kde-workspace.pre-install
@@ -2,5 +2,5 @@
 
 name=kdm
 addgroup -S $name 2>/dev/null
-adduser -S -H -h /var/run/kdm -s /bin/false -D -G $name $name 2>/dev/null
+adduser -S -H -h /var/run/kdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
 exit 0
diff --git a/unmaintained/shadowircd/shadowircd.pre-install b/unmaintained/shadowircd/shadowircd.pre-install
index f8d24e4..e05b5e5 100644
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ b/unmaintained/shadowircd/shadowircd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/run/shadowircd -s /bin/false -D ircd 2>/dev/null
+adduser -S -h /var/run/shadowircd -s /bin/false -D -g ircd ircd 2>/dev/null
 exit 0
-- 
2.6.6




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 5/7] Improve consistency of scripts using adduser/addgroup.

Przemyslaw Pawelczyk
Details
Message ID
<1461410021-29808-6-git-send-email-przemoc@zoho.com>
In-Reply-To
<1461410021-29808-1-git-send-email-przemoc@zoho.com> (view parent)
Sender timestamp
1461410019
DKIM signature
missing
Download raw message
Patch: +318 -150
Following rules have been applied:
- script starts with shebang !#/bin/sh followed by blank line,
- script ends with exit 0 prepended by blank line,
- only stderr of adduser, addgroup or passwd is redirected to /dev/null,
- getent passwd/group instances has been removed,
- manual checking of file and group existence has been removed,
- `|| true` instances has been removed.

Comments and line wrapping have been preserved.
---
 community/caddy/caddy.pre-install                         |  2 ++
 community/davfs2/davfs2.pre-install                       |  5 ++---
 community/docker-registry/docker-registry.pre-install     |  1 +
 community/docker/docker.pre-install                       |  5 ++---
 community/domoticz/domoticz.pre-install                   |  2 ++
 community/icinga2/icinga2.pre-install                     |  4 +++-
 community/minetest/minetest-server.pre-install            |  2 ++
 community/oscam/oscam.pre-install                         |  2 ++
 community/seafile/seafile-server.pre-install              |  1 +
 community/smstools/smstools.pre-install                   |  8 +++++---
 community/sniproxy/sniproxy.pre-install                   |  2 ++
 community/sword/sword.pre-install                         |  5 ++++-
 community/syncthing/syncthing.pre-install                 |  2 ++
 community/tvheadend/tvheadend.pre-install                 |  2 ++
 main/abuild/abuild.pre-install                            |  5 ++---
 main/alpine-baselayout/alpine-baselayout.pre-install      |  5 ++---
 main/alpine-baselayout/alpine-baselayout.pre-upgrade      |  6 +++---
 main/amavisd-new/amavisd-new.pre-install                  |  2 +-
 main/apache2/apache2.pre-install                          |  2 ++
 main/apache2/apache2.pre-upgrade                          |  1 +
 main/aports-build/aports-build.pre-install                |  1 +
 main/arpwatch/arpwatch.pre-install                        |  3 ++-
 main/asterisk/asterisk.pre-install                        |  1 +
 main/asterisk/asterisk.pre-upgrade                        |  1 +
 main/atheme-iris/atheme-iris.pre-install                  |  3 ++-
 main/backuppc/backuppc.pre-install                        |  6 ++++--
 main/bacula-client/bacula-client.pre-install              |  2 ++
 main/bacula/bacula.pre-install                            |  2 ++
 main/bind/bind.pre-install                                |  2 +-
 main/charybdis/charybdis.pre-install                      |  2 ++
 main/chrony/chrony.pre-install                            |  1 +
 main/clamav/clamav-daemon.pre-install                     |  1 +
 main/clamav/clamav-db.pre-install                         |  1 +
 main/clamav/freshclam.pre-install                         |  1 +
 main/clamsmtp/clamsmtp.pre-install                        |  1 +
 main/clamsmtp/clamsmtp.pre-upgrade                        |  1 +
 main/coova-chilli/coova-chilli.pre-install                |  3 ++-
 main/cups/cups.pre-install                                |  1 +
 main/cvechecker/cvechecker.pre-install                    |  7 +++++--
 main/dansguardian/dansguardian.pre-install                |  3 ++-
 main/dbus/dbus.pre-install                                |  1 +
 main/dhcp/dhcp.pre-install                                |  2 +-
 main/distcc/distcc.pre-install                            |  1 +
 main/djbdns/dnscache.pre-install                          |  2 +-
 main/djbdns/tinydns.pre-install                           |  2 +-
 main/dnsmasq/dnsmasq.pre-install                          |  1 +
 main/dovecot/dovecot.pre-install                          |  1 +
 main/ez-ipupdate/ez-ipupdate.pre-install                  |  2 +-
 main/fetchmail/fetchmail.pre-install                      |  1 +
 main/freeradius/freeradius.pre-install                    |  2 +-
 main/gdnsd/gdnsd.pre-install                              |  1 +
 main/gitolite/gitolite.pre-install                        |  2 ++
 main/gnats/gnats.pre-install                              |  1 +
 main/gross/gross.pre-install                              |  2 ++
 main/haproxy/haproxy.pre-install                          |  1 +
 main/haproxy/haproxy.pre-upgrade                          |  1 +
 main/icecast/icecast.pre-install                          |  2 +-
 main/ircservices/ircservices.pre-install                  |  2 +-
 main/kamailio/kamailio.pre-install                        |  2 +-
 main/libgphoto2/libgphoto2.pre-install                    |  5 ++---
 main/libvirt/libvirt.post-install                         |  4 +++-
 main/logcheck/logcheck.pre-install                        |  1 +
 main/mariadb/mariadb.pre-install                          |  2 +-
 main/memcached/memcached.pre-install                      |  2 +-
 main/minidlna/minidlna.pre-install                        |  1 +
 main/mlmmj/mlmmj.pre-install                              |  1 +
 main/mosquitto/mosquitto.pre-install                      |  1 +
 main/mpd/mpd.pre-install                                  |  4 +++-
 main/mumble/murmur.pre-install                            |  6 ++++--
 main/nagios/nagios.pre-install                            |  1 +
 main/ngircd/ngircd.pre-install                            |  1 +
 main/nrpe/nrpe.pre-install                                |  1 +
 main/nsd/nsd.pre-install                                  |  2 ++
 main/nss-pam-ldapd/nss-pam-ldapd.pre-install              |  1 +
 main/ntop/ntop.pre-install                                |  2 ++
 main/open-vm-tools/open-vm-tools.pre-install              |  3 ++-
 main/openntpd/openntpd.pre-install                        |  2 +-
 main/opensmtpd/opensmtpd.pre-install                      |  2 --
 main/opentracker/opentracker.pre-install                  |  2 +-
 main/openvpn/openvpn.pre-install                          |  1 +
 main/pcsc-lite/pcsc-lite.pre-install                      |  1 +
 main/pdnsd/pdnsd.pre-install                              |  1 +
 main/postfix/postfix.pre-install                          |  1 -
 main/postgrey/postgrey.pre-install                        |  2 +-
 main/privoxy/privoxy.pre-install                          |  2 +-
 main/qemu/qemu.pre-install                                |  4 +++-
 main/quagga-nhrp/quagga-nhrp.pre-install                  |  2 +-
 main/quagga/quagga.pre-install                            |  2 +-
 main/radvd/radvd.pre-install                              |  2 ++
 main/redis/redis.pre-install                              |  1 +
 main/rpcbind/rpcbind.pre-install                          |  1 +
 main/rt4/rt4.pre-install                                  |  1 +
 main/rtnppd/rtnppd.pre-install                            |  1 +
 main/rtpproxy/rtpproxy.pre-install                        |  1 +
 main/sems/sems.pre-install                                |  8 ++------
 main/sircbot/sircbot.pre-install                          |  1 +
 main/smokeping/smokeping.pre-install                      |  1 +
 main/snmptt/snmptt.pre-install                            |  4 +++-
 main/snort/snort.pre-install                              |  1 +
 main/squark/squark.post-install                           |  5 ++++-
 main/squid/squid.pre-install                              |  5 +++--
 main/squid/squid.pre-upgrade                              |  5 +++--
 main/strongswan/strongswan.pre-install                    |  8 ++------
 main/subversion/subversion.pre-install                    |  2 +-
 main/trac/trac.pre-install                                |  1 +
 main/umurmur/umurmur.post-install                         |  6 ++++--
 main/unbound/unbound.pre-install                          |  1 +
 main/uvncrepeater/uvncrepeater.pre-install                |  2 +-
 main/varnish/varnish.pre-install                          |  1 +
 main/vlc/vlc-daemon.pre-install                           |  2 ++
 main/vsftpd/vsftpd.pre-install                            |  8 +++++---
 main/ympd/ympd.pre-install                                |  2 ++
 main/zabbix/zabbix-agent.pre-install                      |  2 +-
 main/zabbix/zabbix.pre-install                            |  1 +
 main/znc/znc.pre-install                                  |  2 ++
 testing/3proxy/3proxy.pre-install                         |  2 +-
 testing/at/at.pre-install                                 | 15 +++------------
 testing/bitcoin/bitcoin.pre-install                       |  3 ++-
 testing/buildbot-slave/buildbot-slave.pre-install         |  3 ++-
 testing/buildbot/buildbot.pre-install                     |  3 ++-
 testing/clapf/clapf.pre-install                           |  2 ++
 testing/cluster-glue/cluster-glue.pre-install             |  1 -
 testing/consul/consul.pre-install                         |  6 +++---
 testing/crtmpserver/crtmpserver.pre-install               |  2 ++
 testing/dante/dante-server.pre-install                    |  1 +
 .../darwin-streaming-server.post-install                  |  6 ++++--
 testing/dbmail/dbmail.pre-install                         |  2 +-
 testing/dnscrypt-proxy/dnscrypt-proxy.pre-install         |  2 ++
 testing/drizzle/drizzle.post-install                      |  8 ++++++--
 testing/dspam/dspam.pre-install                           |  2 +-
 testing/ejabberd/ejabberd.pre-install                     |  4 +++-
 testing/elasticsearch/elasticsearch.pre-install           |  4 ++--
 testing/emby/emby.pre-install                             |  2 ++
 testing/fcron/fcron.pre-install                           |  6 ++++--
 testing/gdnsd/gdnsd.pre-install                           |  1 +
 testing/gogs/gogs.pre-install                             |  6 ++++--
 testing/lightdm/lightdm.pre-install                       |  2 ++
 testing/lizardfs/lizardfs.pre-install                     |  1 +
 testing/lshell/lshell.pre-install                         |  2 ++
 testing/lusca/lusca.pre-install                           |  5 +++--
 testing/lusca/lusca.pre-upgrade                           |  5 +++--
 testing/milter-greylist/milter-greylist.pre-install       |  6 ++++--
 testing/mlocate/mlocate.pre-install                       |  2 ++
 testing/mongodb/mongodb.pre-install                       |  5 +++--
 testing/motion/motion.pre-install                         |  5 +++--
 testing/namecoin/namecoin.pre-install                     |  3 ++-
 testing/ntopng/ntopng.pre-install                         |  2 ++
 testing/nut/nut.pre-install                               |  1 +
 testing/opennebula/opennebula-node-kvm.pre-install        |  3 ++-
 testing/opennebula/opennebula.pre-install                 |  3 ++-
 testing/opensips/opensips.pre-install                     |  2 +-
 testing/openxcap/openxcap.pre-install                     |  1 +
 testing/pdns/pdns.pre-install                             |  1 +
 testing/prosody/prosody.pre-install                       |  2 ++
 testing/qpage/qpage.pre-install                           |  4 +++-
 testing/quicktun/quicktun.pre-install                     |  7 ++++---
 testing/radicale/radicale.pre-install                     |  2 ++
 testing/rancid/rancid.pre-install                         |  1 +
 testing/rrdbot/rrdbot.pre-install                         |  2 +-
 testing/rutorrent/rutorrent.pre-install                   |  3 ++-
 testing/sipwise-sems/sipwise-sems.pre-install             |  8 ++------
 testing/socklog/socklog.post-install                      |  1 +
 testing/stunnel/stunnel.pre-install                       |  1 +
 testing/thttpd/thttpd.pre-install                         |  2 ++
 testing/tor/tor.pre-install                               |  3 ++-
 testing/tvheadend-git/tvheadend-git.pre-install           |  2 ++
 testing/udevil/udevil.pre-install                         |  3 ++-
 testing/vault/vault.pre-install                           |  1 +
 testing/vnstat/vnstat.pre-install                         |  1 +
 testing/wt/wt.pre-install                                 |  2 ++
 testing/x2goserver/x2goserver.pre-install                 |  6 ++++--
 testing/zabbix/zabbix-agent.pre-install                   |  1 +
 testing/zabbix/zabbix.pre-install                         |  1 +
 unmaintained/apache-couchdb/apache-couchdb.post-install   |  6 ++++--
 unmaintained/ejabberd-git/ejabberd-git.pre-install        |  4 +++-
 unmaintained/kde-workspace/kde-workspace.pre-install      |  2 ++
 unmaintained/shadowircd/shadowircd.pre-install            |  2 ++
 177 files changed, 318 insertions(+), 150 deletions(-)

diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index 7bf003d..dc78350 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
+
 exit 0
diff --git a/community/davfs2/davfs2.pre-install b/community/davfs2/davfs2.pre-install
index 062477c..2accd54 100755
--- a/community/davfs2/davfs2.pre-install
+++ b/community/davfs2/davfs2.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group davfs2 >/dev/null; then
-	addgroup -S davfs2
-fi
+addgroup -S davfs2 2>/dev/null
+
 exit 0
diff --git a/community/docker-registry/docker-registry.pre-install b/community/docker-registry/docker-registry.pre-install
index 3bc3eab..5d1fbbb 100644
--- a/community/docker-registry/docker-registry.pre-install
+++ b/community/docker-registry/docker-registry.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S docker-registry 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G docker-registry -g docker-registry docker-registry 2>/dev/null
+
 exit 0
diff --git a/community/docker/docker.pre-install b/community/docker/docker.pre-install
index 8a1dec6..8cd2d63 100644
--- a/community/docker/docker.pre-install
+++ b/community/docker/docker.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group docker >/dev/null; then
-	addgroup -S docker
-fi
+addgroup -S docker 2>/dev/null
+
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 077e0fa..5162f88 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null
+
 exit 0
diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install
index e84e09e..7b0002c 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
@@ -1,6 +1,8 @@
 #!/bin/sh
+
 addgroup -S icinga 2>/dev/null
 addgroup -S icingacmd 2>/dev/null
 adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D -g icinga icinga 2>/dev/null
-adduser icinga icingacmd 2>/dev/null 2>/dev/null
+adduser icinga icingacmd 2>/dev/null
+
 exit 0
diff --git a/community/minetest/minetest-server.pre-install b/community/minetest/minetest-server.pre-install
index 4cde639..da9a025 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
+
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index 2f5f5d9..4e0c49a 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
+
 exit 0
diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install
index 66e7a2c..b5c1b4f 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
@@ -4,4 +4,5 @@ SEAFILE_HOME=/var/lib/seafile
 
 addgroup -S -g 800 seafile 2>/dev/null
 adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
+
 exit 0
diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index d9e1d36..0a5106f 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
-addgroup -S smsd &>/dev/null
-adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd &>/dev/null
-adduser -G uucp smsd &>/dev/null
+
+addgroup -S smsd 2>/dev/null
+adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd 2>/dev/null
+adduser -G uucp smsd 2>/dev/null
+
 exit 0
diff --git a/community/sniproxy/sniproxy.pre-install b/community/sniproxy/sniproxy.pre-install
index c56f31d..aa2f7df 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S sniproxy 2>/dev/null
 adduser -S -h /var/log/sniproxy -s /bin/false -D -g sniproxy sniproxy 2>/dev/null
+
 exit 0
diff --git a/community/sword/sword.pre-install b/community/sword/sword.pre-install
index d8abdb5..2ebce6d 100755
--- a/community/sword/sword.pre-install
+++ b/community/sword/sword.pre-install
@@ -1,3 +1,6 @@
 #!/bin/sh
+
 echo "Adding 'sword' group for installing SWORD modules systemwide"
-addgroup -S sword 2>/dev/null >&2 || true
+addgroup -S sword 2>/dev/null
+
+exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index 002a54f..ab337cc 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null
+
 exit 0
diff --git a/community/tvheadend/tvheadend.pre-install b/community/tvheadend/tvheadend.pre-install
index 6fee0b4..6b64423 100644
--- a/community/tvheadend/tvheadend.pre-install
+++ b/community/tvheadend/tvheadend.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
 addgroup tvheadend usb 2>/dev/null
+
 exit 0
diff --git a/main/abuild/abuild.pre-install b/main/abuild/abuild.pre-install
index fb2cf9e..fd3d39a 100644
--- a/main/abuild/abuild.pre-install
+++ b/main/abuild/abuild.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group abuild >/dev/null; then
-	addgroup -S abuild
-fi
+addgroup -S abuild 2>/dev/null
+
 exit 0
diff --git a/main/alpine-baselayout/alpine-baselayout.pre-install b/main/alpine-baselayout/alpine-baselayout.pre-install
index 3b9f141..fc0d0b9 100644
--- a/main/alpine-baselayout/alpine-baselayout.pre-install
+++ b/main/alpine-baselayout/alpine-baselayout.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if [ -e /etc/group ] && ! grep -q '^shadow:' /etc/group; then
-        addgroup -S -g 42 shadow
-fi
+addgroup -S -g 42 shadow 2>/dev/null
 
+exit 0
diff --git a/main/alpine-baselayout/alpine-baselayout.pre-upgrade b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
index 8a7098f..f7c8db8 100644
--- a/main/alpine-baselayout/alpine-baselayout.pre-upgrade
+++ b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
@@ -14,6 +14,6 @@ for i in /etc/modprobe.d/*; do
 	mv "$i" "$i".conf
 done
 
-if [ -e /etc/group ] && ! grep -q '^shadow:' /etc/group; then
-	addgroup -S -g 42 shadow
-fi
+addgroup -S -g 42 shadow 2>/dev/null
+
+exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index d0c0700..5223f9f 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S amavis 2>/dev/null
 adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index cb80323..f142d89 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
+
 addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www -s /sbin/nologin -D -g apache apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
+
 exit 0
diff --git a/main/apache2/apache2.pre-upgrade b/main/apache2/apache2.pre-upgrade
index dbc1d68..bb3dba9 100644
--- a/main/apache2/apache2.pre-upgrade
+++ b/main/apache2/apache2.pre-upgrade
@@ -2,4 +2,5 @@
 
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup apache www-data 2>/dev/null
+
 exit 0
diff --git a/main/aports-build/aports-build.pre-install b/main/aports-build/aports-build.pre-install
index a4928eb..2fdf497 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -D -g buildozer buildozer -s /bin/sh 2>/dev/null
+
 exit 0
diff --git a/main/arpwatch/arpwatch.pre-install b/main/arpwatch/arpwatch.pre-install
index d75874f..56fdfe3 100644
--- a/main/arpwatch/arpwatch.pre-install
+++ b/main/arpwatch/arpwatch.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
index 935466d..df228c2 100644
--- a/main/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
@@ -3,4 +3,5 @@
 adduser -S -h /var/lib/asterisk -s /sbin/nologin -D -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
+
 exit 0
diff --git a/main/asterisk/asterisk.pre-upgrade b/main/asterisk/asterisk.pre-upgrade
index 781d5d8..02414e6 100644
--- a/main/asterisk/asterisk.pre-upgrade
+++ b/main/asterisk/asterisk.pre-upgrade
@@ -3,4 +3,5 @@
 adduser -S -h /var/lib/asterisk -s /bin/false -D -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
+
 exit 0
diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index 4198df2..ef8ea56 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
-exit 0
 
+exit 0
diff --git a/main/backuppc/backuppc.pre-install b/main/backuppc/backuppc.pre-install
index 32440ee..2ed220e 100644
--- a/main/backuppc/backuppc.pre-install
+++ b/main/backuppc/backuppc.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S backuppc &>/dev/null
-adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc &>/dev/null
+
+addgroup -S backuppc 2>/dev/null
+adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc 2>/dev/null
+
 exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 7827de6..363af9d 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S bacula 2>/dev/null
 adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
+
 exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 7827de6..363af9d 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S bacula 2>/dev/null
 adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
+
 exit 0
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 116d51e..49e398b 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S named 2>/dev/null
 adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
index 83ffff3..2dab19b 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/run/charybdis -s /sbin/nologin -D -g ircd ircd 2>/dev/null
+
 exit 0
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
index 41e01c6..32b8fe3 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S chrony 2>/dev/null
 adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D -g chrony chrony 2>/dev/null
+
 exit 0
diff --git a/main/clamav/clamav-daemon.pre-install b/main/clamav/clamav-daemon.pre-install
index 5ef833a..0442c39 100644
--- a/main/clamav/clamav-daemon.pre-install
+++ b/main/clamav/clamav-daemon.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S clamav 2>/dev/null
 adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index f46eabe..b442a43 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/main/clamav/freshclam.pre-install b/main/clamav/freshclam.pre-install
index 5ef833a..0442c39 100644
--- a/main/clamav/freshclam.pre-install
+++ b/main/clamav/freshclam.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S clamav 2>/dev/null
 adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install
index f46eabe..b442a43 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index c673e27..a58c165 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -11,4 +11,5 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 fi
 
 adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
index 15de617..65624f3 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /sbin/nologin -D -g chilli chilli 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/cups/cups.pre-install b/main/cups/cups.pre-install
index 4b099d8..cdb75ca 100644
--- a/main/cups/cups.pre-install
+++ b/main/cups/cups.pre-install
@@ -4,4 +4,5 @@ addgroup -S lpadmin 2>/dev/null
 addgroup -S lp 2>/dev/null
 adduser -S -G lp -g lp lp 2>/dev/null
 addgroup lp lp 2>/dev/null
+
 exit 0
diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install
index b698117..7cc6f41 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
@@ -1,3 +1,6 @@
 #!/bin/sh
-addgroup -S cvechecker &>/dev/null
-adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
+
+addgroup -S cvechecker 2>/dev/null
+adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker 2>/dev/null
+
+exit 0
diff --git a/main/dansguardian/dansguardian.pre-install b/main/dansguardian/dansguardian.pre-install
index e897f8c..201fdfc 100644
--- a/main/dansguardian/dansguardian.pre-install
+++ b/main/dansguardian/dansguardian.pre-install
@@ -6,5 +6,6 @@ adduser -S -D -H \
 	-s /sbin/nologin \
 	-G dansguar \
 	-g dansguar \
-	dansguar 2>/dev/null || true
+	dansguar 2>/dev/null
 
+exit 0
diff --git a/main/dbus/dbus.pre-install b/main/dbus/dbus.pre-install
index 7fdb08a..c736ea0 100644
--- a/main/dbus/dbus.pre-install
+++ b/main/dbus/dbus.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S messagebus 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -g messagebus messagebus -G messagebus 2>/dev/null
+
 exit 0
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 5aaa6c4..83ba7f0 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/lib/dhcp -s /sbin/nologin -D -g dhcp dhcp 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index b408b4a..15d591d 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S distcc 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D -g distcc distcc 2>/dev/null
+
 exit 0
diff --git a/main/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index 106fc29..1b58fff 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index 8676fb4..094f0d8 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 43f60b8..1263e54 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S dnsmasq 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D -g dnsmasq dnsmasq 2>/dev/null
+
 exit 0
diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index 481132b..d3c3468 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -2,4 +2,5 @@
 
 adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D -g dovecot dovecot 2>/dev/null
 adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D -g dovenull dovenull 2>/dev/null
+
 exit 0
diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install
index 23d9fae..b6b7e22 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D -g ipupdate ipupdate 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index 67681f8..d9c1aed 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D -g fetchmail fetchmail 2>/dev/null
+
 exit 0
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index f02c2c0..8b09032 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S radius 2>/dev/null
 adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -g radius radius 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index 040e7f1..8e8af59 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S gdnsd 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
+
 exit 0
diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install
index 2d155ab..80a3a71 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /var/lib/git -s /bin/sh -D -g git git 2>/dev/null
+
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 81093a4..a66e2d9 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/lib/gnatsdb -D -g gnats gnats 2>/dev/null
+
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index d3a5f85..22fecf4 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /sbin/nologin -D -g gross gross 2>/dev/null
+
 exit 0
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 72b8ab0..162855a 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -10,3 +10,4 @@ if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
 	mv /etc/haproxy.cfg /etc/haproxy/haproxy.cfg
 fi
 
+exit 0
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 72b8ab0..162855a 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
@@ -10,3 +10,4 @@ if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
 	mv /etc/haproxy.cfg /etc/haproxy/haproxy.cfg
 fi
 
+exit 0
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index 8734c1e..562611b 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast  2>/dev/null
+adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast 2>/dev/null
 
 exit 0
diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install
index 4f6144a..2f08491 100644
--- a/main/ircservices/ircservices.pre-install
+++ b/main/ircservices/ircservices.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/lib/ircservices -s /sbin/nologin -D -g ircservices ircservices 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index 19d11f5..e38239d 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S kamailio 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio 2>/dev/null
 
 exit 0
diff --git a/main/libgphoto2/libgphoto2.pre-install b/main/libgphoto2/libgphoto2.pre-install
index a7d3144..c696fcd 100644
--- a/main/libgphoto2/libgphoto2.pre-install
+++ b/main/libgphoto2/libgphoto2.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group camera >/dev/null; then
-	addgroup -S camera
-fi
+addgroup -S camera 2>/dev/null
 
+exit 0
diff --git a/main/libvirt/libvirt.post-install b/main/libvirt/libvirt.post-install
index 0be14b9..a747701 100755
--- a/main/libvirt/libvirt.post-install
+++ b/main/libvirt/libvirt.post-install
@@ -1,3 +1,5 @@
 #!/bin/sh
-addgroup -S libvirt &>/dev/null
+
+addgroup -S libvirt 2>/dev/null
+
 exit 0
diff --git a/main/logcheck/logcheck.pre-install b/main/logcheck/logcheck.pre-install
index ea6028c..818fda5 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S logcheck 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck -g logcheck logcheck 2>/dev/null
+
 exit 0
diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install
index e4f16d2..14677b1 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S mysql 2>/dev/null
 adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D -g mysql mysql 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index df22cd5..4440f4e 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -s /sbin/nologin -D -g memcached memcached 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/minidlna/minidlna.pre-install b/main/minidlna/minidlna.pre-install
index 4423a73..4fc20e6 100644
--- a/main/minidlna/minidlna.pre-install
+++ b/main/minidlna/minidlna.pre-install
@@ -3,4 +3,5 @@
 addgroup -S minidlna 2>/dev/null
 adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -G minidlna \
 	-g minidlna minidlna 2>/dev/null
+
 exit 0
diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install
index 046a821..7a7b32c 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S mlmmj 2>/dev/null
 adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj -g mlmmj mlmmj 2>/dev/null
+
 exit 0
diff --git a/main/mosquitto/mosquitto.pre-install b/main/mosquitto/mosquitto.pre-install
index a0a8f72..518d9f2 100644
--- a/main/mosquitto/mosquitto.pre-install
+++ b/main/mosquitto/mosquitto.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S mosquitto 2>/dev/null
 adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto -g mosquitto mosquitto 2>/dev/null
+
 exit 0
diff --git a/main/mpd/mpd.pre-install b/main/mpd/mpd.pre-install
index 7e012f8..934307b 100644
--- a/main/mpd/mpd.pre-install
+++ b/main/mpd/mpd.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null || true
+adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null
+
+exit 0
diff --git a/main/mumble/murmur.pre-install b/main/mumble/murmur.pre-install
index cb0e0eb..980ed34 100755
--- a/main/mumble/murmur.pre-install
+++ b/main/mumble/murmur.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S murmur
-adduser -S -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" -H -D murmur
+
+addgroup -S murmur 2>/dev/null
+adduser -S -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" -H -D murmur 2>/dev/null
+
 exit 0
diff --git a/main/nagios/nagios.pre-install b/main/nagios/nagios.pre-install
index d9c0f3c..2e2dbbf 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S nagios 2>/dev/null
 adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin -g nagios nagios 2>/dev/null
+
 exit 0
diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index 036c9ab..bb5f05a 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -h /etc/ngircd -s /sbin/nologin -D -g ngircd ngircd 2>/dev/null
+
 exit 0
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index 7ee629b..e00f960 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -2,4 +2,5 @@
 
 adduser -S -H -h /dev/null -s /sbin/nologin -D -g nagios nagios 2>/dev/null
 addgroup -S nagios 2>/dev/null
+
 exit 0
diff --git a/main/nsd/nsd.pre-install b/main/nsd/nsd.pre-install
index 106ac00..a94f6e0 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S nsd 2>/dev/null
 adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin -g nsd nsd 2>/dev/null
+
 exit 0
diff --git a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
index 5a7076f..58b4216 100644
--- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
+++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
@@ -6,4 +6,5 @@ groupname=$username
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
 	-g $username $username 2>/dev/null
+
 exit 0
diff --git a/main/ntop/ntop.pre-install b/main/ntop/ntop.pre-install
index 2386dc8..9af92bb 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S ntop 2>/dev/null
 adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
+
 exit 0
diff --git a/main/open-vm-tools/open-vm-tools.pre-install b/main/open-vm-tools/open-vm-tools.pre-install
index 15fbca3..39b4850 100644
--- a/main/open-vm-tools/open-vm-tools.pre-install
+++ b/main/open-vm-tools/open-vm-tools.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S vmware 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index 997e7bf..c3d9986 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp 2>/dev/null
 
 exit 0
diff --git a/main/opensmtpd/opensmtpd.pre-install b/main/opensmtpd/opensmtpd.pre-install
index af0620e..8cbebc1 100644
--- a/main/opensmtpd/opensmtpd.pre-install
+++ b/main/opensmtpd/opensmtpd.pre-install
@@ -2,10 +2,8 @@
 
 addgroup -S smtpd 2>/dev/null
 addgroup -S smtpq 2>/dev/null
-
 adduser -S -H -D -s /sbin/nologin -h /dev/null -g 'SMTP Daemon' -G smtpd smtpd 2>/dev/null
 adduser -S -H -D -s /sbin/nologin -h /dev/null -g 'SMTPD Queue' -G smtpq smtpq 2>/dev/null
-
 mkdir -p /var/spool/mail
 
 exit 0
diff --git a/main/opentracker/opentracker.pre-install b/main/opentracker/opentracker.pre-install
index 2e591db..4a573b2 100644
--- a/main/opentracker/opentracker.pre-install
+++ b/main/opentracker/opentracker.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -D -H -h /var/empty -s /sbin/false -g opentracker opentracker 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install
index 37e0bf2..ff553b8 100644
--- a/main/openvpn/openvpn.pre-install
+++ b/main/openvpn/openvpn.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S openvpn 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn -g openvpn openvpn 2>/dev/null
+
 exit 0
diff --git a/main/pcsc-lite/pcsc-lite.pre-install b/main/pcsc-lite/pcsc-lite.pre-install
index 192e10e..2b90929 100644
--- a/main/pcsc-lite/pcsc-lite.pre-install
+++ b/main/pcsc-lite/pcsc-lite.pre-install
@@ -6,4 +6,5 @@ groupname=$username
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
 	-g $username $username 2>/dev/null
+
 exit 0
diff --git a/main/pdnsd/pdnsd.pre-install b/main/pdnsd/pdnsd.pre-install
index b916dab..164ef02 100644
--- a/main/pdnsd/pdnsd.pre-install
+++ b/main/pdnsd/pdnsd.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin -g pdnsd pdnsd 2>/dev/null
+
 exit 0
diff --git a/main/postfix/postfix.pre-install b/main/postfix/postfix.pre-install
index 6a59570..d00c3eb 100644
--- a/main/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
@@ -6,5 +6,4 @@ adduser -S -h /var/spool/postfix -G postfix -g postfix postfix 2>/dev/null
 addgroup postfix mail 2>/dev/null
 adduser -S -H -s /sbin/nologin -h /var/mail/domains -G postdrop -g vmail vmail 2>/dev/null
 
-
 exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index e745acf..f70564c 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 -H -h /dev/null -s /sbin/nologin -D -g postgrey postgrey  2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g postgrey postgrey 2>/dev/null
 
 exit 0
diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install
index 72b4ac1..3f6c759 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S privoxy 2>/dev/null
 adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D -g privoxy privoxy 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/qemu/qemu.pre-install b/main/qemu/qemu.pre-install
index d644941..9aae4a4 100644
--- a/main/qemu/qemu.pre-install
+++ b/main/qemu/qemu.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-getent group kvm >/dev/null || addgroup -S -g 34 kvm
+addgroup -S -g 34 kvm 2>/dev/null
+
+exit 0
diff --git a/main/quagga-nhrp/quagga-nhrp.pre-install b/main/quagga-nhrp/quagga-nhrp.pre-install
index f8340fa..f3b4471 100644
--- a/main/quagga-nhrp/quagga-nhrp.pre-install
+++ b/main/quagga-nhrp/quagga-nhrp.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S quagga 2>/dev/null
 adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/quagga/quagga.pre-install b/main/quagga/quagga.pre-install
index f8340fa..f3b4471 100644
--- a/main/quagga/quagga.pre-install
+++ b/main/quagga/quagga.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S quagga 2>/dev/null
 adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/radvd/radvd.pre-install b/main/radvd/radvd.pre-install
index cc06c7d..44c76a2 100644
--- a/main/radvd/radvd.pre-install
+++ b/main/radvd/radvd.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
+
 addgroup -S radvd 2>/dev/null
 adduser -S -s /sbin/nologin -D -H -G radvd \
 	-g "Router advertisement (radvd) user" radvd 2>/dev/null
+
 exit 0
diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install
index 2a59934..b6cbd05 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S redis 2>/dev/null
 adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis -g redis redis 2>/dev/null
+
 exit 0
diff --git a/main/rpcbind/rpcbind.pre-install b/main/rpcbind/rpcbind.pre-install
index 51fae45..fe6a826 100644
--- a/main/rpcbind/rpcbind.pre-install
+++ b/main/rpcbind/rpcbind.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S rpc 2>/dev/null
 adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc -g rpc rpc 2>/dev/null
+
 exit 0
diff --git a/main/rt4/rt4.pre-install b/main/rt4/rt4.pre-install
index b62454d..8832783 100644
--- a/main/rt4/rt4.pre-install
+++ b/main/rt4/rt4.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S rt4 2>/dev/null
 adduser -S -s /sbin/nologin -G rt4 -D -H -g "Request Tracker 4 user" rt4 2>/dev/null
+
 exit 0
diff --git a/main/rtnppd/rtnppd.pre-install b/main/rtnppd/rtnppd.pre-install
index faf0431..ec21795 100644
--- a/main/rtnppd/rtnppd.pre-install
+++ b/main/rtnppd/rtnppd.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S rtnppd 2>/dev/null
 adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin -g rtnppd rtnppd 2>/dev/null
+
 exit 0
diff --git a/main/rtpproxy/rtpproxy.pre-install b/main/rtpproxy/rtpproxy.pre-install
index cbf1e52..93a10a8 100644
--- a/main/rtpproxy/rtpproxy.pre-install
+++ b/main/rtpproxy/rtpproxy.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S rtpproxy 2>/dev/null
 adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin -g rtpproxy rtpproxy 2>/dev/null
+
 exit 0
diff --git a/main/sems/sems.pre-install b/main/sems/sems.pre-install
index b3b5c78..83d4f74 100644
--- a/main/sems/sems.pre-install
+++ b/main/sems/sems.pre-install
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-if ! getent group sems >/dev/null; then
-	addgroup -S sems
-fi
-if ! getent passwd sems >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
-fi
+addgroup -S sems 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
 
 exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index 8bfedcc..c9db472 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S sircbot 2>/dev/null
 adduser -S -h /var/run/sircbot -G sircbot -D -g sircbot sircbot 2>/dev/null
+
 exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index 3158cc4..f13ff10 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S smokeping 2>/dev/null
 adduser -S -h /var/lib/smokeping -D -G smokeping -g smokeping smokeping 2>/dev/null
+
 exit 0
diff --git a/main/snmptt/snmptt.pre-install b/main/snmptt/snmptt.pre-install
index efc8a6e..e0c65c8 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
-adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt &>/dev/null
+
+adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt 2>/dev/null
+
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index 47608ed..bd0791b 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/log/snort -s /sbin/nologin -D -g snort snort 2>/dev/null
+
 exit 0
diff --git a/main/squark/squark.post-install b/main/squark/squark.post-install
index 3c40694..f4f8798 100755
--- a/main/squark/squark.post-install
+++ b/main/squark/squark.post-install
@@ -1,2 +1,5 @@
 #!/bin/sh
-addgroup -S squark &>/dev/null || exit 0
+
+addgroup -S squark 2>/dev/null
+
+exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index 3ac1f9f..11ff2bc 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g squid squid -H /var/cache/squid  2>/dev/null
+adduser -S -D -g squid squid -H /var/cache/squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
-addgroup squid winbind
+addgroup squid winbind 2>/dev/null
+
 exit 0
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index 3ac1f9f..11ff2bc 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g squid squid -H /var/cache/squid  2>/dev/null
+adduser -S -D -g squid squid -H /var/cache/squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
-addgroup squid winbind
+addgroup squid winbind 2>/dev/null
+
 exit 0
diff --git a/main/strongswan/strongswan.pre-install b/main/strongswan/strongswan.pre-install
index 12371d1..83b9328 100644
--- a/main/strongswan/strongswan.pre-install
+++ b/main/strongswan/strongswan.pre-install
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-if ! getent group ipsec >/dev/null; then
-	addgroup -S ipsec
-fi
-if ! getent passwd ipsec >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec -g ipsec ipsec 2>/dev/null
-fi
+addgroup -S ipsec 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec -g ipsec ipsec 2>/dev/null
 
 exit 0
diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index 3109006..955baee 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S svnusers 2>/dev/null
 adduser -S -g svn svn -D -h /var/svn -G svnusers 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install
index 0fa8f02..05e9f2a 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S tracd 2>/dev/null
 adduser -S -s /sbin/nologin -G tracd -D -H -g tracd tracd 2>/dev/null
+
 exit 0
diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index d9a350a..771aed1 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S umurmur &>/dev/null
-adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur &>/dev/null
+
+addgroup -S umurmur 2>/dev/null
+adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur 2>/dev/null
+
 exit 0
diff --git a/main/unbound/unbound.pre-install b/main/unbound/unbound.pre-install
index 4cd64d5..63c00e9 100644
--- a/main/unbound/unbound.pre-install
+++ b/main/unbound/unbound.pre-install
@@ -3,4 +3,5 @@
 addgroup -S unbound 2>/dev/null
 adduser -S -s /sbin/nologin -D -H -h /etc/unbound -G unbound \
 	-g "Unbound user" unbound 2>/dev/null
+
 exit 0
diff --git a/main/uvncrepeater/uvncrepeater.pre-install b/main/uvncrepeater/uvncrepeater.pre-install
index 0c856f8..052cd7f 100644
--- a/main/uvncrepeater/uvncrepeater.pre-install
+++ b/main/uvncrepeater/uvncrepeater.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -D -g uvncrep uvncrep 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/varnish/varnish.pre-install b/main/varnish/varnish.pre-install
index 74ccfd1..4e34a09 100644
--- a/main/varnish/varnish.pre-install
+++ b/main/varnish/varnish.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S varnish 2>/dev/null
 adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish -g varnish varnish 2>/dev/null
+
 exit 0
diff --git a/main/vlc/vlc-daemon.pre-install b/main/vlc/vlc-daemon.pre-install
index 33f99df..778c27a 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 groups="vlc audio video"
+
 for group in $groups; do
 	addgroup -S $group 2>/dev/null
 done
@@ -10,4 +11,5 @@ adduser -S -h /home/vlc -s /bin/sh -G vlc -D -g vlc vlc 2>/dev/null
 for group in $groups; do
 	addgroup vlc $group 2>/dev/null
 done
+
 exit 0
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index 0ed59d9..c6e45f1 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
-addgroup -S ftp &>/dev/null
-addgroup vsftp ftp &>/dev/null
-adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp &>/dev/null
+
+addgroup -S ftp 2>/dev/null
+addgroup vsftp ftp 2>/dev/null
+adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp 2>/dev/null
+
 exit 0
diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install
index 369f25d..a9a6edb 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -D -s /sbin/nologin -G audio -g ympd ympd 2>/dev/null
+
 exit 0
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
index a63d884..7cc5be2 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
-addgroup -g 30 zabbix 2>/dev/null
+
 exit 0
diff --git a/main/zabbix/zabbix.pre-install b/main/zabbix/zabbix.pre-install
index 30851f1..7cc5be2 100644
--- a/main/zabbix/zabbix.pre-install
+++ b/main/zabbix/zabbix.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
+
 exit 0
diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index c0e1fa5..17c3bbc 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -D -s /sbin/nologin -g znc znc 2>/dev/null
+
 exit 0
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index 46e6ea5..c314228 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S 3proxy 2>/dev/null
 adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -g 3proxy 3proxy 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index a35aa48..e3c28ec 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -1,16 +1,7 @@
 #!/bin/sh
 
-if ! getent group at >/dev/null; then
-	addgroup -S at 2>/dev/null
-fi
-
-if ! getent passwd at >/dev/null; then
-	adduser -S -H -s /bin/false -D -g at at 2>/dev/null
-fi
-
-if [ -z `echo " $(groups at) " | grep ' at '`] ; then
-	addgroup at at 2>/dev/null
-fi
+addgroup -S at 2>/dev/null
+adduser -S -H -s /bin/false -D -g at at 2>/dev/null
+addgroup at at 2>/dev/null
 
 exit 0
-
diff --git a/testing/bitcoin/bitcoin.pre-install b/testing/bitcoin/bitcoin.pre-install
index f020a8b..9cf75bb 100644
--- a/testing/bitcoin/bitcoin.pre-install
+++ b/testing/bitcoin/bitcoin.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
+
 addgroup -S bitcoin 2>/dev/null
 adduser -S -H -h /var/lib/bitcoin -g bitcoin -G bitcoin -D -s /sbin/nologin bitcoin 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index 40e2945..ca33aac 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index 40e2945..ca33aac 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index dff8c72..eec8afe 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/testing/cluster-glue/cluster-glue.pre-install b/testing/cluster-glue/cluster-glue.pre-install
index 2dff6b2..ce20da4 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
@@ -8,4 +8,3 @@ adduser -S -g hacluster hacluster \
 	2>/dev/null
 
 exit 0
-
diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install
index 4d7a385..1b9ea9d 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Create consul group and user
-addgroup -S consul 2> /dev/null
-adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2> /dev/null
-exit 0
+addgroup -S consul 2>/dev/null
+adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2>/dev/null
 
+exit 0
diff --git a/testing/crtmpserver/crtmpserver.pre-install b/testing/crtmpserver/crtmpserver.pre-install
index 643a6f8..e8dc1c7 100644
--- a/testing/crtmpserver/crtmpserver.pre-install
+++ b/testing/crtmpserver/crtmpserver.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/crtmpserver -s /bin/false -g rtmpd rtmpd 2>/dev/null
+
 exit 0
diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install
index f657308..d11b163 100644
--- a/testing/dante/dante-server.pre-install
+++ b/testing/dante/dante-server.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S sockd 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd -g sockd sockd 2>/dev/null
+
 exit 0
diff --git a/testing/darwin-streaming-server/darwin-streaming-server.post-install b/testing/darwin-streaming-server/darwin-streaming-server.post-install
index 005bd35..3d4786e 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S qtss &>/dev/null
-adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss &>/dev/null
+
+addgroup -S qtss 2>/dev/null
+adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss 2>/dev/null
+
 exit 0
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index 1f650df..bca9a6f 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -s /bin/false -D -H -h /var/lib/dbmail -g dbmail dbmail 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
index 3bee7f2..34a4de6 100644
--- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
+++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S dnscrypt 2>/dev/null
 adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin -g dnscrypt dnscrypt 2>/dev/null
+
 exit 0
diff --git a/testing/drizzle/drizzle.post-install b/testing/drizzle/drizzle.post-install
index e7c7dcb..64016b2 100644
--- a/testing/drizzle/drizzle.post-install
+++ b/testing/drizzle/drizzle.post-install
@@ -1,2 +1,6 @@
-addgroup -S drizzle
-adduser -SDHG drizzle -g drizzle drizzle
+#!/bin/sh
+
+addgroup -S drizzle 2>/dev/null
+adduser -SDHG drizzle -g drizzle drizzle 2>/dev/null
+
+exit 0
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index d06ab90..e7a059c 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -2,5 +2,5 @@
 
 adduser -S -h /var/lib/dspam -s /bin/false -D -g dspam dspam 2>/dev/null
 chown dspam:dspam /var/lib/dspam
-exit 0
 
+exit 0
diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index d4cab3c..efda04b 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd  2>/dev/null
+
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+
 exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 63e023a..54cd0d8 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-addgroup -S elastico
+addgroup -S elastico 2>/dev/null
 adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
-	-g "added by apk for elasticsearch" -DH elastico
+	-g "added by apk for elasticsearch" -DH elastico 2>/dev/null
 
 exit 0
diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install
index cfe5965..70555e4 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
+
 addgroup -S emby 2>/dev/null
 adduser -S -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
 	-G emby emby 2>/dev/null
+
 exit 0
diff --git a/testing/fcron/fcron.pre-install b/testing/fcron/fcron.pre-install
index d513ffd..d4d66fd 100644
--- a/testing/fcron/fcron.pre-install
+++ b/testing/fcron/fcron.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-adduser -S -D -g fcron fcron -H -s /sbin/nologin  2>/dev/null
-addgroup -S fcron
+
+adduser -S -D -g fcron fcron -H -s /sbin/nologin 2>/dev/null
+addgroup -S fcron 2>/dev/null
+
 exit 0
diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
index 040e7f1..8e8af59 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S gdnsd 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
+
 exit 0
diff --git a/testing/gogs/gogs.pre-install b/testing/gogs/gogs.pre-install
index 1596d65..b1d3258 100644
--- a/testing/gogs/gogs.pre-install
+++ b/testing/gogs/gogs.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null || true
-passwd -u gogs || true
+adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null
+passwd -u gogs 2>/dev/null
+
+exit 0
diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install
index b8dbf56..b7efe57 100644
--- a/testing/lightdm/lightdm.pre-install
+++ b/testing/lightdm/lightdm.pre-install
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 name=lightdm
+
 addgroup -S $name 2>/dev/null
 adduser -S -H -h /var/run/lightdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
+
 exit 0
diff --git a/testing/lizardfs/lizardfs.pre-install b/testing/lizardfs/lizardfs.pre-install
index f302e85..e4b14a6 100644
--- a/testing/lizardfs/lizardfs.pre-install
+++ b/testing/lizardfs/lizardfs.pre-install
@@ -3,4 +3,5 @@
 addgroup -S mfs 2>/dev/null
 adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs -g mfs mfs \
 	2>/dev/null
+
 exit 0
diff --git a/testing/lshell/lshell.pre-install b/testing/lshell/lshell.pre-install
index 89e31b2..8aedffa 100644
--- a/testing/lshell/lshell.pre-install
+++ b/testing/lshell/lshell.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S lshell 2>/dev/null
 adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin -g lshell lshell 2>/dev/null
+
 exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 72953cf..f70964f 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
 addgroup -S winbind 2>/dev/null
-addgroup lusca winbind
+addgroup lusca winbind 2>/dev/null
+
 exit 0
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index 72953cf..f70964f 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
 addgroup -S winbind 2>/dev/null
-addgroup lusca winbind
+addgroup lusca winbind 2>/dev/null
+
 exit 0
diff --git a/testing/milter-greylist/milter-greylist.pre-install b/testing/milter-greylist/milter-greylist.pre-install
index f5e5359..c104db9 100644
--- a/testing/milter-greylist/milter-greylist.pre-install
+++ b/testing/milter-greylist/milter-greylist.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S smmsp &>/dev/null
-adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp &>/dev/null
+
+addgroup -S smmsp 2>/dev/null
+adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp 2>/dev/null
+
 exit 0
diff --git a/testing/mlocate/mlocate.pre-install b/testing/mlocate/mlocate.pre-install
index 18aa121..8ae6bbd 100644
--- a/testing/mlocate/mlocate.pre-install
+++ b/testing/mlocate/mlocate.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 addgroup -S locate 2>/dev/null
+
 exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 93c85ec..12b09a1 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-addgroup -S mongodb
-adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb
+addgroup -S mongodb 2>/dev/null
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb 2>/dev/null
+
 exit 0
diff --git a/testing/motion/motion.pre-install b/testing/motion/motion.pre-install
index 7e66ab0..91a4c34 100644
--- a/testing/motion/motion.pre-install
+++ b/testing/motion/motion.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
+
 addgroup -S motion 2>/dev/null
 adduser -S -h /home/motion -s /bin/false -G motion -D -g motion motion 2>/dev/null
-addgroup motion video
-exit 0
+addgroup motion video 2>/dev/null
 
+exit 0
diff --git a/testing/namecoin/namecoin.pre-install b/testing/namecoin/namecoin.pre-install
index 33c72d1..530d027 100644
--- a/testing/namecoin/namecoin.pre-install
+++ b/testing/namecoin/namecoin.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
+
 addgroup -S namecoin 2>/dev/null
 adduser -S -h /var/lib/namecoin -g namecoin -G namecoin -D -s /sbin/nologin namecoin 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/ntopng/ntopng.pre-install b/testing/ntopng/ntopng.pre-install
index 2386dc8..9af92bb 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S ntop 2>/dev/null
 adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
+
 exit 0
diff --git a/testing/nut/nut.pre-install b/testing/nut/nut.pre-install
index cea4d7f..707f98d 100644
--- a/testing/nut/nut.pre-install
+++ b/testing/nut/nut.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser nut uucp 2>/dev/null
+
 exit 0
diff --git a/testing/opennebula/opennebula-node-kvm.pre-install b/testing/opennebula/opennebula-node-kvm.pre-install
index 5cf97ee..73173a7 100644
--- a/testing/opennebula/opennebula-node-kvm.pre-install
+++ b/testing/opennebula/opennebula-node-kvm.pre-install
@@ -8,5 +8,6 @@ adduser -S -D -s /bin/ash \
 addgroup oneadmin libvirt 2>/dev/null
 addgroup oneadmin readproc 2>/dev/null
 addgroup oneadmin kvm 2>/dev/null
-passwd -u oneadmin &>/dev/null
+passwd -u oneadmin 2>/dev/null
+
 exit 0
diff --git a/testing/opennebula/opennebula.pre-install b/testing/opennebula/opennebula.pre-install
index e59e414..15527eb 100644
--- a/testing/opennebula/opennebula.pre-install
+++ b/testing/opennebula/opennebula.pre-install
@@ -4,5 +4,6 @@ addgroup -S oneadmin 2>/dev/null
 adduser -S -D -s /bin/ash \
 	-H -h /var/lib/one -G oneadmin \
 	-g "OpenNebula user" oneadmin 2>/dev/null
-passwd -u oneadmin &>/dev/null
+passwd -u oneadmin 2>/dev/null
+
 exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 9ef4702..8d07749 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips  2>/dev/null
+adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips 2>/dev/null
 
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index 44ad106..7c90e27 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S openxcap 2>/dev/null
 adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H -g openxcap openxcap 2>/dev/null
+
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index e0b3c5a..bf00793 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -h /var/empty -D -s /bin/false -g pdns pdns 2>/dev/null
+
 exit 0
diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install
index e2fab21..c15127d 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S prosody 2>/dev/null
 adduser -S -D \
 	-h /var/lib/prosody \
@@ -6,4 +7,5 @@ adduser -S -D \
 	-g "Prosody XMPP Server" \
     -G prosody \
 	prosody 2>/dev/null
+
 exit 0
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index aaa8d3e..5e7eed0 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null || true
+adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null
+
+exit 0
diff --git a/testing/quicktun/quicktun.pre-install b/testing/quicktun/quicktun.pre-install
index c17d220..b3c4c50 100755
--- a/testing/quicktun/quicktun.pre-install
+++ b/testing/quicktun/quicktun.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
-addgroup -S quicktun
-adduser -S -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" -H -D quicktun
-exit 0
 
+addgroup -S quicktun 2>/dev/null
+adduser -S -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" -H -D quicktun 2>/dev/null
+
+exit 0
diff --git a/testing/radicale/radicale.pre-install b/testing/radicale/radicale.pre-install
index f101c38..c15cf63 100644
--- a/testing/radicale/radicale.pre-install
+++ b/testing/radicale/radicale.pre-install
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 name=radicale
+
 addgroup -S $name 2>/dev/null
 adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -G $name -g $name $name 2>/dev/null
 addgroup $name $name 2>/dev/null
+
 exit 0
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index 7204ea3..51e0dc8 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S netadm 2>/dev/null
 adduser -S -h /var/rancid -s /bin/sh -G netadm -D -g rancid rancid 2>/dev/null
+
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 291f918..7004829 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd  2>/dev/null
+adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd 2>/dev/null
 
 exit 0
diff --git a/testing/rutorrent/rutorrent.pre-install b/testing/rutorrent/rutorrent.pre-install
index 0d81455..2c539f6 100644
--- a/testing/rutorrent/rutorrent.pre-install
+++ b/testing/rutorrent/rutorrent.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S rutorrent 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/sipwise-sems/sipwise-sems.pre-install b/testing/sipwise-sems/sipwise-sems.pre-install
index b3b5c78..83d4f74 100644
--- a/testing/sipwise-sems/sipwise-sems.pre-install
+++ b/testing/sipwise-sems/sipwise-sems.pre-install
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-if ! getent group sems >/dev/null; then
-	addgroup -S sems
-fi
-if ! getent passwd sems >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
-fi
+addgroup -S sems 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
 
 exit 0
diff --git a/testing/socklog/socklog.post-install b/testing/socklog/socklog.post-install
index 3f1b8a3..a663d3d 100644
--- a/testing/socklog/socklog.post-install
+++ b/testing/socklog/socklog.post-install
@@ -19,3 +19,4 @@ exec chpst -Unobody socklog unix /dev/log
 EOF
 fi
 
+exit 0
diff --git a/testing/stunnel/stunnel.pre-install b/testing/stunnel/stunnel.pre-install
index cfb5805..22e6f41 100644
--- a/testing/stunnel/stunnel.pre-install
+++ b/testing/stunnel/stunnel.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S stunnel 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel -g stunnel stunnel 2>/dev/null
+
 exit 0
diff --git a/testing/thttpd/thttpd.pre-install b/testing/thttpd/thttpd.pre-install
index c2ccfb7..12e8607 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
@@ -4,3 +4,5 @@ addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
         -D -g thttpd thttpd 2>/dev/null
 addgroup thttpd www-data 2>/dev/null
+
+exit 0
diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install
index 2353635..5796d11 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/run/tor -s /sbin/nologin -D -g tor tor 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/tvheadend-git/tvheadend-git.pre-install b/testing/tvheadend-git/tvheadend-git.pre-install
index 84ca2f8..3999c33 100644
--- a/testing/tvheadend-git/tvheadend-git.pre-install
+++ b/testing/tvheadend-git/tvheadend-git.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
 adduser tvheadend video
+
 exit 0
diff --git a/testing/udevil/udevil.pre-install b/testing/udevil/udevil.pre-install
index bd4b7de..9d4b1c3 100644
--- a/testing/udevil/udevil.pre-install
+++ b/testing/udevil/udevil.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S plugdev 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/vault/vault.pre-install b/testing/vault/vault.pre-install
index 60d449f..3df21bb 100644
--- a/testing/vault/vault.pre-install
+++ b/testing/vault/vault.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S vault 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault -g vault vault 2>/dev/null
+
 exit 0
diff --git a/testing/vnstat/vnstat.pre-install b/testing/vnstat/vnstat.pre-install
index 9445d10..e253007 100644
--- a/testing/vnstat/vnstat.pre-install
+++ b/testing/vnstat/vnstat.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S vnstat 2>/dev/null
 adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat -g vnstat vnstat 2>/dev/null
+
 exit 0
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index 849322d..07311bd 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
+
 addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -s /sbin/nologin -D -g wt wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
+
 exit 0
diff --git a/testing/x2goserver/x2goserver.pre-install b/testing/x2goserver/x2goserver.pre-install
index 911390e..6a20a96 100755
--- a/testing/x2goserver/x2goserver.pre-install
+++ b/testing/x2goserver/x2goserver.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-addgroup -S x2gouser
-adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser
+addgroup -S x2gouser 2>/dev/null
+adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser 2>/dev/null
+
+exit 0
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
index 3ec8ae7..2464f27 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
@@ -3,4 +3,5 @@
 addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 addgroup -S -g 30 zabbix 2>/dev/null
+
 exit 0
diff --git a/testing/zabbix/zabbix.pre-install b/testing/zabbix/zabbix.pre-install
index 30851f1..7cc5be2 100644
--- a/testing/zabbix/zabbix.pre-install
+++ b/testing/zabbix/zabbix.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
+
 exit 0
diff --git a/unmaintained/apache-couchdb/apache-couchdb.post-install b/unmaintained/apache-couchdb/apache-couchdb.post-install
index 4bf99a4..ae1da50 100755
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ b/unmaintained/apache-couchdb/apache-couchdb.post-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S couchdb &>/dev/null
-adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -g couchdb couchdb &>/dev/null
+
+addgroup -S couchdb 2>/dev/null
+adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -g couchdb couchdb 2>/dev/null
+
 exit 0
diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install
index d4cab3c..efda04b 100644
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd  2>/dev/null
+
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+
 exit 0
diff --git a/unmaintained/kde-workspace/kde-workspace.pre-install b/unmaintained/kde-workspace/kde-workspace.pre-install
index ef2e671..b55298b 100644
--- a/unmaintained/kde-workspace/kde-workspace.pre-install
+++ b/unmaintained/kde-workspace/kde-workspace.pre-install
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 name=kdm
+
 addgroup -S $name 2>/dev/null
 adduser -S -H -h /var/run/kdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
+
 exit 0
diff --git a/unmaintained/shadowircd/shadowircd.pre-install b/unmaintained/shadowircd/shadowircd.pre-install
index e05b5e5..58b2a85 100644
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ b/unmaintained/shadowircd/shadowircd.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/run/shadowircd -s /bin/false -D -g ircd ircd 2>/dev/null
+
 exit 0
-- 
2.6.6




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 6/7] main/squid: Fix squid's home directory specification.

Przemyslaw Pawelczyk
Details
Message ID
<1461410021-29808-7-git-send-email-przemoc@zoho.com>
In-Reply-To
<1461410021-29808-1-git-send-email-przemoc@zoho.com> (view parent)
Sender timestamp
1461410020
DKIM signature
missing
Download raw message
Patch: +2 -2
Previously it led to setting default one in /home/.
---
 main/squid/squid.pre-install | 2 +-
 main/squid/squid.pre-upgrade | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index 11ff2bc..f613759 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -g squid squid -H /var/cache/squid 2>/dev/null
+adduser -S -D -h /var/cache/squid -g squid squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind 2>/dev/null
 
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index 11ff2bc..f613759 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -g squid squid -H /var/cache/squid 2>/dev/null
+adduser -S -D -h /var/cache/squid -g squid squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind 2>/dev/null
 
-- 
2.6.6




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 7/7] Reorder arguments passed to addgroup/adduser in scripts.

Przemyslaw Pawelczyk
Details
Message ID
<1461410021-29808-8-git-send-email-przemoc@zoho.com>
In-Reply-To
<1461410021-29808-1-git-send-email-przemoc@zoho.com> (view parent)
Sender timestamp
1461410021
DKIM signature
missing
Download raw message
Patch: +191 -190
Now all invocations have following order of arguments (if present):

    addgroup -S -g ... GROUP
    adduser -S -u ... -D -H -h ... -s ... -G ... -g ... USER
---
 community/caddy/caddy.pre-install                                   | 2 +-
 community/docker-registry/docker-registry.pre-install               | 2 +-
 community/domoticz/domoticz.pre-install                             | 2 +-
 community/icinga2/icinga2.pre-install                               | 2 +-
 community/minetest/minetest-server.pre-install                      | 2 +-
 community/oscam/oscam.pre-install                                   | 2 +-
 community/redmine/redmine.pre-install                               | 2 +-
 community/seafile/seafile-server.pre-install                        | 2 +-
 community/smstools/smstools.pre-install                             | 2 +-
 community/sniproxy/sniproxy.pre-install                             | 2 +-
 community/syncthing/syncthing.pre-install                           | 2 +-
 community/tvheadend/tvheadend.pre-install                           | 2 +-
 main/amavisd-new/amavisd-new.pre-install                            | 2 +-
 main/apache2/apache2.pre-install                                    | 2 +-
 main/arpwatch/arpwatch.pre-install                                  | 2 +-
 main/asterisk/asterisk.pre-install                                  | 2 +-
 main/asterisk/asterisk.pre-upgrade                                  | 2 +-
 main/atheme-iris/atheme-iris.pre-install                            | 2 +-
 main/avahi/avahi.pre-install                                        | 5 ++---
 main/backuppc/backuppc.pre-install                                  | 2 +-
 main/bacula-client/bacula-client.pre-install                        | 2 +-
 main/bacula/bacula.pre-install                                      | 2 +-
 main/bind/bind.pre-install                                          | 2 +-
 main/charybdis/charybdis.pre-install                                | 2 +-
 main/chrony/chrony.pre-install                                      | 2 +-
 main/clamav/clamav-daemon.pre-install                               | 2 +-
 main/clamav/clamav-db.pre-install                                   | 2 +-
 main/clamav/freshclam.pre-install                                   | 2 +-
 main/clamsmtp/clamsmtp.pre-install                                  | 2 +-
 main/clamsmtp/clamsmtp.pre-upgrade                                  | 2 +-
 main/coova-chilli/coova-chilli.pre-install                          | 2 +-
 main/cvechecker/cvechecker.pre-install                              | 2 +-
 main/darkhttpd/darkhttpd.pre-install                                | 2 +-
 main/dbus/dbus.pre-install                                          | 2 +-
 main/dhcp/dhcp.pre-install                                          | 2 +-
 main/distcc/distcc.pre-install                                      | 2 +-
 main/djbdns/dnscache.pre-install                                    | 2 +-
 main/djbdns/tinydns.pre-install                                     | 2 +-
 main/dnsmasq/dnsmasq.pre-install                                    | 2 +-
 main/dovecot/dovecot.pre-install                                    | 4 ++--
 main/ez-ipupdate/ez-ipupdate.pre-install                            | 2 +-
 main/fetchmail/fetchmail.pre-install                                | 2 +-
 main/freeradius/freeradius.pre-install                              | 2 +-
 main/freeswitch/freeswitch.pre-install                              | 2 +-
 main/gdnsd/gdnsd.pre-install                                        | 2 +-
 main/gitolite/gitolite.pre-install                                  | 2 +-
 main/gnats/gnats.pre-install                                        | 2 +-
 main/gross/gross.pre-install                                        | 2 +-
 main/haproxy/haproxy.pre-install                                    | 2 +-
 main/haproxy/haproxy.pre-upgrade                                    | 2 +-
 main/icecast/icecast.pre-install                                    | 2 +-
 main/ircservices/ircservices.pre-install                            | 2 +-
 main/kamailio/kamailio.pre-install                                  | 2 +-
 main/lighttpd/lighttpd.pre-install                                  | 2 +-
 main/logcheck/logcheck.pre-install                                  | 2 +-
 main/mariadb/mariadb.pre-install                                    | 2 +-
 main/memcached/memcached.pre-install                                | 2 +-
 main/mini_httpd/mini_httpd.pre-install                              | 4 ++--
 main/minidlna/minidlna.pre-install                                  | 2 +-
 main/mlmmj/mlmmj.pre-install                                        | 2 +-
 main/mosquitto/mosquitto.pre-install                                | 2 +-
 main/mpd/mpd.pre-install                                            | 2 +-
 main/mumble/murmur.pre-install                                      | 2 +-
 main/nagios/nagios.pre-install                                      | 2 +-
 main/nginx-initscripts/nginx-initscripts.pre-install                | 4 ++--
 main/nginx/nginx-common.pre-install                                 | 2 +-
 main/ngircd/ngircd.pre-install                                      | 2 +-
 main/nrpe/nrpe.pre-install                                          | 2 +-
 main/nsd/nsd.pre-install                                            | 2 +-
 main/nss-pam-ldapd/nss-pam-ldapd.pre-install                        | 2 +-
 main/ntop/ntop.pre-install                                          | 2 +-
 main/openldap/openldap.pre-install                                  | 4 ++--
 main/openntpd/openntpd.pre-install                                  | 2 +-
 main/opensmtpd/opensmtpd.pre-install                                | 4 ++--
 main/openvpn/openvpn.pre-install                                    | 2 +-
 main/pcsc-lite/pcsc-lite.pre-install                                | 2 +-
 main/perdition/perdition.pre-install                                | 2 +-
 main/postfix/postfix.pre-install                                    | 2 +-
 main/postgrey/postgrey.pre-install                                  | 2 +-
 main/privoxy/privoxy.pre-install                                    | 2 +-
 main/quagga-nhrp/quagga-nhrp.pre-install                            | 2 +-
 main/quagga/quagga.pre-install                                      | 2 +-
 main/quassel/quassel-core.pre-install                               | 2 +-
 main/radvd/radvd.pre-install                                        | 2 +-
 main/redis/redis.pre-install                                        | 2 +-
 main/rpcbind/rpcbind.pre-install                                    | 2 +-
 main/rt4/rt4.pre-install                                            | 2 +-
 main/rtnppd/rtnppd.pre-install                                      | 2 +-
 main/rtpproxy/rtpproxy.pre-install                                  | 2 +-
 main/sems/sems.pre-install                                          | 2 +-
 main/sircbot/sircbot.pre-install                                    | 2 +-
 main/smokeping/smokeping.pre-install                                | 2 +-
 main/snmptt/snmptt.pre-install                                      | 2 +-
 main/snort/snort.pre-install                                        | 2 +-
 main/strongswan/strongswan.pre-install                              | 2 +-
 main/subversion/subversion.pre-install                              | 2 +-
 main/tinyproxy/tinyproxy.pre-install                                | 2 +-
 main/trac/trac.pre-install                                          | 2 +-
 main/transmission/transmission-daemon.pre-install                   | 2 +-
 main/umurmur/umurmur.post-install                                   | 2 +-
 main/unbound/unbound.pre-install                                    | 2 +-
 main/varnish/varnish.pre-install                                    | 2 +-
 main/vde2/vde2.pre-install                                          | 2 +-
 main/vlc/vlc-daemon.pre-install                                     | 2 +-
 main/zabbix/zabbix-agent.pre-install                                | 2 +-
 main/zabbix/zabbix.pre-install                                      | 2 +-
 testing/3proxy/3proxy.pre-install                                   | 2 +-
 testing/at/at.pre-install                                           | 2 +-
 testing/bitcoin/bitcoin.pre-install                                 | 2 +-
 testing/buildbot-slave/buildbot-slave.pre-install                   | 2 +-
 testing/buildbot/buildbot.pre-install                               | 2 +-
 testing/clapf/clapf.pre-install                                     | 2 +-
 testing/cluster-glue/cluster-glue.pre-install                       | 6 ++++--
 testing/consul/consul.pre-install                                   | 2 +-
 testing/dante/dante-server.pre-install                              | 2 +-
 .../darwin-streaming-server/darwin-streaming-server.post-install    | 2 +-
 testing/dbmail/dbmail.pre-install                                   | 2 +-
 testing/dnscrypt-proxy/dnscrypt-proxy.pre-install                   | 2 +-
 testing/drizzle/drizzle.post-install                                | 2 +-
 testing/dspam/dspam.pre-install                                     | 2 +-
 testing/ejabberd/ejabberd.pre-install                               | 2 +-
 testing/elasticsearch/elasticsearch.pre-install                     | 4 ++--
 testing/emby/emby.pre-install                                       | 4 ++--
 testing/exim/exim.pre-install                                       | 2 +-
 testing/fcron/fcron.pre-install                                     | 2 +-
 testing/gdnsd/gdnsd.pre-install                                     | 2 +-
 testing/gogs/gogs.pre-install                                       | 2 +-
 testing/h2o/h2o.pre-install                                         | 2 +-
 testing/knot/knot.pre-install                                       | 2 +-
 testing/lightdm/lightdm.pre-install                                 | 2 +-
 testing/lizardfs/lizardfs.pre-install                               | 2 +-
 testing/logstash/logstash.pre-install                               | 4 ++--
 testing/lshell/lshell.pre-install                                   | 2 +-
 testing/lusca/lusca.pre-install                                     | 2 +-
 testing/lusca/lusca.pre-upgrade                                     | 2 +-
 testing/milter-greylist/milter-greylist.pre-install                 | 2 +-
 testing/mongodb/mongodb.pre-install                                 | 2 +-
 testing/motion/motion.pre-install                                   | 2 +-
 testing/munin/munin-node.pre-install                                | 2 +-
 testing/namecoin/namecoin.pre-install                               | 2 +-
 testing/nginx-naxsi/nginx-naxsi.pre-install                         | 4 ++--
 testing/ntopng/ntopng.pre-install                                   | 2 +-
 testing/opennebula/opennebula-node-kvm.pre-install                  | 4 ++--
 testing/opennebula/opennebula.pre-install                           | 4 ++--
 testing/opensips/opensips.pre-install                               | 2 +-
 testing/openxcap/openxcap.pre-install                               | 2 +-
 testing/pdns/pdns.pre-install                                       | 2 +-
 testing/prosody/prosody.pre-install                                 | 2 +-
 testing/qpage/qpage.pre-install                                     | 2 +-
 testing/quicktun/quicktun.pre-install                               | 2 +-
 testing/radicale/radicale.pre-install                               | 2 +-
 testing/rancid/rancid.pre-install                                   | 2 +-
 testing/rmilter/rmilter.pre-install                                 | 2 +-
 testing/rrdbot/rrdbot.pre-install                                   | 2 +-
 testing/rspamd/rspamd.pre-install                                   | 2 +-
 testing/sipwise-sems/sipwise-sems.pre-install                       | 2 +-
 testing/socklog/socklog.post-install                                | 2 +-
 testing/stunnel/stunnel.pre-install                                 | 2 +-
 testing/tengine/tengine.pre-install                                 | 4 ++--
 testing/tengine/tengine.pre-upgrade                                 | 4 ++--
 testing/thttpd/thttpd.pre-install                                   | 4 ++--
 testing/tor/tor.pre-install                                         | 2 +-
 testing/tvheadend-git/tvheadend-git.pre-install                     | 2 +-
 testing/vault/vault.pre-install                                     | 2 +-
 testing/vnstat/vnstat.pre-install                                   | 2 +-
 testing/wt/wt.pre-install                                           | 2 +-
 testing/x2goserver/x2goserver.pre-install                           | 2 +-
 testing/zabbix/zabbix-agent.pre-install                             | 2 +-
 testing/zabbix/zabbix.pre-install                                   | 2 +-
 unmaintained/apache-couchdb/apache-couchdb.post-install             | 2 +-
 unmaintained/ejabberd-git/ejabberd-git.pre-install                  | 2 +-
 unmaintained/kde-workspace/kde-workspace.pre-install                | 2 +-
 unmaintained/shadowircd/shadowircd.pre-install                      | 2 +-
 173 files changed, 191 insertions(+), 190 deletions(-)

diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index dc78350..ccb4f07 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
+adduser -S -D -h /var/lib/caddy -s /sbin/nologin -g caddy caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
 
 exit 0
diff --git a/community/docker-registry/docker-registry.pre-install b/community/docker-registry/docker-registry.pre-install
index 5d1fbbb..8c1c986 100644
--- a/community/docker-registry/docker-registry.pre-install
+++ b/community/docker-registry/docker-registry.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S docker-registry 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G docker-registry -g docker-registry docker-registry 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G docker-registry -g docker-registry docker-registry 2>/dev/null
 
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 5162f88..2272067 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null
+adduser -S -D -h /var/lib/domoticz -s /sbin/nologin -g domoticz domoticz 2>/dev/null
 
 exit 0
diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install
index 7b0002c..ccb5265 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
@@ -2,7 +2,7 @@
 
 addgroup -S icinga 2>/dev/null
 addgroup -S icingacmd 2>/dev/null
-adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D -g icinga icinga 2>/dev/null
+adduser -S -D -H -h /var/spool/icinga2 -s /sbin/nologin -G icinga -g icinga icinga 2>/dev/null
 adduser icinga icingacmd 2>/dev/null
 
 exit 0
diff --git a/community/minetest/minetest-server.pre-install b/community/minetest/minetest-server.pre-install
index da9a025..ec187b9 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
+adduser -S -D -h /var/lib/minetest -s /sbin/nologin -G games -g minetest minetest 2>/dev/null
 
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index 4e0c49a..a9982c7 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g oscam oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
 
 exit 0
diff --git a/community/redmine/redmine.pre-install b/community/redmine/redmine.pre-install
index 072bd1d..8957913 100644
--- a/community/redmine/redmine.pre-install
+++ b/community/redmine/redmine.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D -g redmine redmine 2>/dev/null
+adduser -S -D -H -h /usr/share/webapps/redmine -s /bin/sh -g redmine redmine 2>/dev/null
 addgroup redmine www-data 2>/dev/null
 
 exit 0
diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install
index b5c1b4f..7e3df0b 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
@@ -3,6 +3,6 @@
 SEAFILE_HOME=/var/lib/seafile
 
 addgroup -S -g 800 seafile 2>/dev/null
-adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
+adduser -S -u 800 -D -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile seafile 2>/dev/null
 
 exit 0
diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index 0a5106f..104cf12 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S smsd 2>/dev/null
-adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd 2>/dev/null
+adduser -S -D -h /var/spool/sms -s /sbin/nologin -G smsd -g smsd smsd 2>/dev/null
 adduser -G uucp smsd 2>/dev/null
 
 exit 0
diff --git a/community/sniproxy/sniproxy.pre-install b/community/sniproxy/sniproxy.pre-install
index aa2f7df..e0e250a 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sniproxy 2>/dev/null
-adduser -S -h /var/log/sniproxy -s /bin/false -D -g sniproxy sniproxy 2>/dev/null
+adduser -S -D -h /var/log/sniproxy -s /bin/false -g sniproxy sniproxy 2>/dev/null
 
 exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index ab337cc..a2ee46c 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null
+adduser -S -D -H -h /var/lib/syncthing -s /sbin/nologin -g syncthing syncthing 2>/dev/null
 
 exit 0
diff --git a/community/tvheadend/tvheadend.pre-install b/community/tvheadend/tvheadend.pre-install
index 6b64423..3e270cb 100644
--- a/community/tvheadend/tvheadend.pre-install
+++ b/community/tvheadend/tvheadend.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
+adduser -S -H -h /usr/share/tvheadend -s /sbin/nologin -G video -g tvheadend tvheadend 2>/dev/null
 addgroup tvheadend usb 2>/dev/null
 
 exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index 5223f9f..e672682 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S amavis 2>/dev/null
-adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null
+adduser -S -D -h /var/amavis -s /sbin/nologin -G amavis -g amavis amavis 2>/dev/null
 
 exit 0
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index f142d89..703681e 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www -s /sbin/nologin -D -g apache apache 2>/dev/null
+adduser -S -D -H -h /var/www -s /sbin/nologin -g apache apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
 
 exit 0
diff --git a/main/arpwatch/arpwatch.pre-install b/main/arpwatch/arpwatch.pre-install
index 56fdfe3..a8d1e31 100644
--- a/main/arpwatch/arpwatch.pre-install
+++ b/main/arpwatch/arpwatch.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g arpwatch arpwatch 2>/dev/null
 
 exit 0
diff --git a/main/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
index df228c2..5396c69 100644
--- a/main/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/asterisk -s /sbin/nologin -D -g asterisk asterisk 2>/dev/null
+adduser -S -D -h /var/lib/asterisk -s /sbin/nologin -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 
diff --git a/main/asterisk/asterisk.pre-upgrade b/main/asterisk/asterisk.pre-upgrade
index 02414e6..0b09a3f 100644
--- a/main/asterisk/asterisk.pre-upgrade
+++ b/main/asterisk/asterisk.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/asterisk -s /bin/false -D -g asterisk asterisk 2>/dev/null
+adduser -S -D -h /var/lib/asterisk -s /bin/false -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 
diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index ef8ea56..490ba08 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
+adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -g iris iris >/dev/null
 
 exit 0
diff --git a/main/avahi/avahi.pre-install b/main/avahi/avahi.pre-install
index 33802ca..89b2fd4 100644
--- a/main/avahi/avahi.pre-install
+++ b/main/avahi/avahi.pre-install
@@ -2,12 +2,11 @@
 
 addgroup -S -g 28 netdev 2>/dev/null
 addgroup -S -g 86 avahi 2>/dev/null
-adduser -S -u 86 \
+adduser -S -u 86 -D -H \
 	-h /var/run/avahi-daemon \
 	-s /sbin/nologin \
-	-D -H \
-	-g "Avahi System User" \
 	-G avahi \
+	-g "Avahi System User" \
 	avahi 2>/dev/null
 
 exit 0
diff --git a/main/backuppc/backuppc.pre-install b/main/backuppc/backuppc.pre-install
index 2ed220e..eea6696 100644
--- a/main/backuppc/backuppc.pre-install
+++ b/main/backuppc/backuppc.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S backuppc 2>/dev/null
-adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc 2>/dev/null
+adduser -S -D -H -h /var/lib/BackupPC -s /bin/sh -G backuppc -g "BackupPC user" backuppc 2>/dev/null
 
 exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 363af9d..4116667 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
+adduser -S -D -h /var/lib/bacula/ -s /sbin/nologin -G bacula -g bacula bacula 2>/dev/null
 
 exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 363af9d..4116667 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh