Mail archive
alpine-aports

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

From: Przemyslaw Pawelczyk <przemoc_at_zoho.com>
Date: Sat, 23 Apr 2016 13:13:41 +0200

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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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
_at_@ -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/bind/bind.pre-install b/main/bind/bind.pre-install
index 49e398b..430f2b8 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S named 2>/dev/null
-adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null
+adduser -S -D -h /etc/bind -s /sbin/nologin -G named -g named named 2>/dev/null
 
 exit 0
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
index 2dab19b..8675cb9 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/run/charybdis -s /sbin/nologin -D -g ircd ircd 2>/dev/null
+adduser -S -D -h /var/run/charybdis -s /sbin/nologin -g ircd ircd 2>/dev/null
 
 exit 0
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
index 32b8fe3..897fb74 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S chrony 2>/dev/null
-adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D -g chrony chrony 2>/dev/null
+adduser -S -D -h /var/log/chrony -s /sbin/nologin -G chrony -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 0442c39..a5da829 100644
--- a/main/clamav/clamav-daemon.pre-install
+++ b/main/clamav/clamav-daemon.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 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
+adduser -S -D -H -h /var/lib/clamav -s /sbin/nologin -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 b442a43..d1e52fb 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g clamav clamav 2>/dev/null
 
 exit 0
diff --git a/main/clamav/freshclam.pre-install b/main/clamav/freshclam.pre-install
index 0442c39..a5da829 100644
--- a/main/clamav/freshclam.pre-install
+++ b/main/clamav/freshclam.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 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
+adduser -S -D -H -h /var/lib/clamav -s /sbin/nologin -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 b442a43..d1e52fb 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g clamav clamav 2>/dev/null
 
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index a58c165..959576d 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
_at_@ -10,6 +10,6 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 	echo " *"
 fi
 
-adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
+adduser -S -D -H -s /bin/false -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 65624f3..bf6ea4c 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g chilli chilli 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g chilli chilli 2>/dev/null
 
 exit 0
diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install
index 7cc6f41..2e60d1c 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S cvechecker 2>/dev/null
-adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker 2>/dev/null
+adduser -S -D -h /var/cvechecker -G cvechecker -g cvechecker cvechecker 2>/dev/null
 
 exit 0
diff --git a/main/darkhttpd/darkhttpd.pre-install b/main/darkhttpd/darkhttpd.pre-install
index b189233..bd73148 100644
--- a/main/darkhttpd/darkhttpd.pre-install
+++ b/main/darkhttpd/darkhttpd.pre-install
_at_@ -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 -g darkhttpd \
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -g darkhttpd \
 	darkhttpd 2>/dev/null
 addgroup darkhttpd www-data 2>/dev/null
 
diff --git a/main/dbus/dbus.pre-install b/main/dbus/dbus.pre-install
index c736ea0..2623d00 100644
--- a/main/dbus/dbus.pre-install
+++ b/main/dbus/dbus.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S messagebus 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -g messagebus messagebus -G messagebus 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G messagebus -g messagebus messagebus 2>/dev/null
 
 exit 0
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 83ba7f0..2e0b839 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/dhcp -s /sbin/nologin -D -g dhcp dhcp 2>/dev/null
+adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -g dhcp dhcp 2>/dev/null
 
 exit 0
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index 15d591d..ef4cf19 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S distcc 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D -g distcc distcc 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G distcc -g distcc distcc 2>/dev/null
 
 exit 0
diff --git a/main/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index 1b58fff..664732c 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
+adduser -S -D -H -h /etc/dnscache -g dnscache -s /sbin/nologin dnscache 2>/dev/null
 
 exit 0
diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index 094f0d8..85ba7e7 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
+adduser -S -D -H -h /etc/tinydns -s /sbin/nologin -g tinydns tinydns 2>/dev/null
 
 exit 0
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 1263e54..708c15b 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S dnsmasq 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D -g dnsmasq dnsmasq 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G dnsmasq -g dnsmasq dnsmasq 2>/dev/null
 
 exit 0
diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index d3c3468..e19b113 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-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
+adduser -S -u 90 -D -H -h /dev/null -s /sbin/nologin -g dovecot dovecot 2>/dev/null
+adduser -S -u 91 -D -H -h /dev/null -s /sbin/nologin -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 b6b7e22..11b4c57 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D -g ipupdate ipupdate 2>/dev/null
+adduser -S -D -h /var/lib/ez-ipupdate -s /sbin/nologin -g ipupdate ipupdate 2>/dev/null
 
 exit 0
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index d9c1aed..ed3d409 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D -g fetchmail fetchmail 2>/dev/null
+adduser -S -D -H -h /var/lib/fetchmail -s /sbin/nologin -g fetchmail fetchmail 2>/dev/null
 
 exit 0
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index 8b09032..b5a11be 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S radius 2>/dev/null
-adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -g radius radius 2>/dev/null
+adduser -S -D -h /var/log/radius -s /sbin/nologin -G radius -g radius radius 2>/dev/null
 
 exit 0
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
index f175cd3..6f31b67 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D -g freeswitch freeswitch 2>/dev/null
+adduser -S -D -H -h /var/run/freeswitch -s /sbin/nologin -g freeswitch freeswitch 2>/dev/null
 
 exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index 8e8af59..0bd9cb7 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S gdnsd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 80a3a71..506ef1d 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/git -s /bin/sh -D -g git git 2>/dev/null
+adduser -S -D -H -h /var/lib/git -s /bin/sh -g git git 2>/dev/null
 
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index a66e2d9..e3a4de0 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gnatsdb -D -g gnats gnats 2>/dev/null
+adduser -S -D -h /var/lib/gnatsdb -g gnats gnats 2>/dev/null
 
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index 22fecf4..078372d 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g gross gross 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g gross gross 2>/dev/null
 
 exit 0
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 162855a..85cefc9 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S haproxy 2>/dev/null
-adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
+adduser -S -D -H -h /var/lib/haproxy -s /bin/false \
 	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 162855a..85cefc9 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S haproxy 2>/dev/null
-adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
+adduser -S -D -H -h /var/lib/haproxy -s /bin/false \
 	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index 562611b..3ee9c4a 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast 2>/dev/null
+adduser -S -D -h /var/log/icecast -s /sbin/nologin -g icecast icecast 2>/dev/null
 
 exit 0
diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install
index 2f08491..ee50e3b 100644
--- a/main/ircservices/ircservices.pre-install
+++ b/main/ircservices/ircservices.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/ircservices -s /sbin/nologin -D -g ircservices ircservices 2>/dev/null
+adduser -S -D -h /var/lib/ircservices -s /sbin/nologin -g ircservices ircservices 2>/dev/null
 
 exit 0
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index e38239d..1e63e58 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
_at_@ -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 -D -H -h /var/empty -s /sbin/nologin -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 80f2562..25f2b01 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
_at_@ -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 -g lighttpd lighttpd 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -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 818fda5..2b33bcd 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S logcheck 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck -g logcheck logcheck 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 14677b1..2ab1374 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mysql 2>/dev/null
-adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D -g mysql mysql 2>/dev/null
+adduser -S -D -h /var/lib/mysql -s /sbin/nologin -G mysql -g mysql mysql 2>/dev/null
 
 exit 0
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index 4440f4e..8ff0274 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g memcached memcached 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -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 63876f7..c2a9d1f 100644
--- a/main/mini_httpd/mini_httpd.pre-install
+++ b/main/mini_httpd/mini_httpd.pre-install
_at_@ -8,8 +8,8 @@ if [ -f /etc/mini_httpd.conf ] && ! [ -L /etc/mini_httpd.conf ]; then
 fi
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-        -D -g minihttpd minihttpd 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \
+        -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 4fc20e6..e06c1c7 100644
--- a/main/minidlna/minidlna.pre-install
+++ b/main/minidlna/minidlna.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S minidlna 2>/dev/null
-adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -G minidlna \
+adduser -S -D -H -h /var/run/minidlna -s /sbin/nologin -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 7a7b32c..e3a5821 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 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
+adduser -S -D -H -h /var/spool/mlmmj -s /sbin/nologin -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 518d9f2..960dfd8 100644
--- a/main/mosquitto/mosquitto.pre-install
+++ b/main/mosquitto/mosquitto.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mosquitto 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto -g mosquitto mosquitto 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -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 934307b..c0439b7 100644
--- a/main/mpd/mpd.pre-install
+++ b/main/mpd/mpd.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null
+adduser -S -D -h /var/lib/mpd -s /sbin/nologin -G audio -g mpd mpd 2>/dev/null
 
 exit 0
diff --git a/main/mumble/murmur.pre-install b/main/mumble/murmur.pre-install
index 980ed34..d8be4a5 100755
--- a/main/mumble/murmur.pre-install
+++ b/main/mumble/murmur.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 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
+adduser -S -D -H -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" murmur 2>/dev/null
 
 exit 0
diff --git a/main/nagios/nagios.pre-install b/main/nagios/nagios.pre-install
index 2e2dbbf..eaa87fb 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S nagios 2>/dev/null
-adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin -g nagios nagios 2>/dev/null
+adduser -S -H -h /var/nagios -s /sbin/nologin -G nagios -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 00bd0de..8512f43 100644
--- a/main/nginx-initscripts/nginx-initscripts.pre-install
+++ b/main/nginx-initscripts/nginx-initscripts.pre-install
_at_@ -2,8 +2,8 @@
 
 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 -g nginx nginx 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -G nginx \
+	-g nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0
diff --git a/main/nginx/nginx-common.pre-install b/main/nginx/nginx-common.pre-install
index 27bf2de..ae5b685 100644
--- a/main/nginx/nginx-common.pre-install
+++ b/main/nginx/nginx-common.pre-install
_at_@ -2,7 +2,7 @@
 
 addgroup -Sg 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
-adduser -S -h /var/lib/nginx -g "nginx" -s /sbin/nologin -DHG nginx nginx 2>/dev/null
+adduser -S -D -H -h /var/lib/nginx -s /sbin/nologin -G nginx -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 bb5f05a..c073447 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /etc/ngircd -s /sbin/nologin -D -g ngircd ngircd 2>/dev/null
+adduser -S -D -H -h /etc/ngircd -s /sbin/nologin -g ngircd ngircd 2>/dev/null
 
 exit 0
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index e00f960..875a9fa 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -H -h /dev/null -s /sbin/nologin -D -g nagios nagios 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 a94f6e0..f523c97 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
_at_@ -1,6 +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
+adduser -S -H -h /var/db/nsd -s /sbin/nologin -G nsd -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 58b4216..b6a03db 100644
--- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
+++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
_at_@ -4,7 +4,7 @@ username=nslcd
 groupname=$username
 
 addgroup -S $username 2>/dev/null
-adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
+adduser -S -D -H -h /var/run/$username -s /sbin/nologin -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 9af92bb..0fea81b 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
_at_@ -1,6 +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
+adduser -S -D -H -h /var/lib/ntop -s /sbin/nologin -G ntop -g ntop ntop 2>/dev/null
 
 exit 0
diff --git a/main/openldap/openldap.pre-install b/main/openldap/openldap.pre-install
index a01f4fa..eb6b10f 100644
--- a/main/openldap/openldap.pre-install
+++ b/main/openldap/openldap.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S ldap 2>/dev/null
-adduser -S -h /usr/lib/openldap -s /sbin/nologin -D -H -g "OpenLdap User" \
-	-G ldap ldap 2>/dev/null
+adduser -S -D -H -h /usr/lib/openldap -s /sbin/nologin -G ldap \
+	-g "OpenLdap User" ldap 2>/dev/null
 
 exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index c3d9986..6b8204b 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
_at_@ -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 -D -H -h /var/empty -s /sbin/nologin -g ntp ntp 2>/dev/null
 
 exit 0
diff --git a/main/opensmtpd/opensmtpd.pre-install b/main/opensmtpd/opensmtpd.pre-install
index 8cbebc1..b81ac75 100644
--- a/main/opensmtpd/opensmtpd.pre-install
+++ b/main/opensmtpd/opensmtpd.pre-install
_at_@ -2,8 +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
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G smtpd -g 'SMTP Daemon' smtpd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G smtpq -g 'SMTPD Queue' smtpq 2>/dev/null
 mkdir -p /var/spool/mail
 
 exit 0
diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install
index ff553b8..c072535 100644
--- a/main/openvpn/openvpn.pre-install
+++ b/main/openvpn/openvpn.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S openvpn 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn -g openvpn openvpn 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 2b90929..2e654f2 100644
--- a/main/pcsc-lite/pcsc-lite.pre-install
+++ b/main/pcsc-lite/pcsc-lite.pre-install
_at_@ -4,7 +4,7 @@ username=pcscd
 groupname=$username
 
 addgroup -S $username 2>/dev/null
-adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
+adduser -S -D -H -h /var/run/$username -s /sbin/nologin -G $groupname \
 	-g $username $username 2>/dev/null
 
 exit 0
diff --git a/main/perdition/perdition.pre-install b/main/perdition/perdition.pre-install
index 1c0b01e..b268e4c 100644
--- a/main/perdition/perdition.pre-install
+++ b/main/perdition/perdition.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S perdition 2>/dev/null
-adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D -g perdition perdition 2>/dev/null
+adduser -S -D -h /var/run/perdition -s /sbin/nologin -G perdition -g perdition perdition 2>/dev/null
 
 exit 0
diff --git a/main/postfix/postfix.pre-install b/main/postfix/postfix.pre-install
index d00c3eb..fc62efb 100644
--- a/main/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
_at_@ -4,6 +4,6 @@ addgroup -S postfix 2>/dev/null
 addgroup -S postdrop 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 -g vmail vmail 2>/dev/null
+adduser -S -H -h /var/mail/domains -s /sbin/nologin -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 f70564c..5f1d560 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
_at_@ -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 -D -H -h /dev/null -s /sbin/nologin -g postgrey postgrey 2>/dev/null
 
 exit 0
diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install
index 3f6c759..60a2f76 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S privoxy 2>/dev/null
-adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D -g privoxy privoxy 2>/dev/null
+adduser -S -D -h /var/log/privoxy -s /sbin/nologin -G privoxy -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 f3b4471..53569ce 100644
--- a/main/quagga-nhrp/quagga-nhrp.pre-install
+++ b/main/quagga-nhrp/quagga-nhrp.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S quagga 2>/dev/null
-adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
+adduser -S -D -h /var/run/quagga -s /sbin/nologin -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 f3b4471..53569ce 100644
--- a/main/quagga/quagga.pre-install
+++ b/main/quagga/quagga.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S quagga 2>/dev/null
-adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
+adduser -S -D -h /var/run/quagga -s /sbin/nologin -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 01ec63d..bbfc977 100644
--- a/main/quassel/quassel-core.pre-install
+++ b/main/quassel/quassel-core.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/quassel -s /sbin/nologin -D -g quassel quassel 2>/dev/null
+adduser -S -D -h /var/lib/quassel -s /sbin/nologin -g quassel quassel 2>/dev/null
 addgroup -S quassel 2>/dev/null
 addgroup quassel quassel
 
diff --git a/main/radvd/radvd.pre-install b/main/radvd/radvd.pre-install
index 44c76a2..d2e238a 100644
--- a/main/radvd/radvd.pre-install
+++ b/main/radvd/radvd.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S radvd 2>/dev/null
-adduser -S -s /sbin/nologin -D -H -G radvd \
+adduser -S -D -H -s /sbin/nologin -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 b6cbd05..f732131 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 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
+adduser -S -D -H -h /var/lib/redis -s /bin/false -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 fe6a826..771cdbf 100644
--- a/main/rpcbind/rpcbind.pre-install
+++ b/main/rpcbind/rpcbind.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rpc 2>/dev/null
-adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc -g rpc rpc 2>/dev/null
+adduser -S -D -h /var/lib/rpcbind -s /sbin/nologin -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 8832783..f6f1024 100644
--- a/main/rt4/rt4.pre-install
+++ b/main/rt4/rt4.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rt4 2>/dev/null
-adduser -S -s /sbin/nologin -G rt4 -D -H -g "Request Tracker 4 user" rt4 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G rt4 -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 ec21795..7151c5d 100644
--- a/main/rtnppd/rtnppd.pre-install
+++ b/main/rtnppd/rtnppd.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rtnppd 2>/dev/null
-adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin -g rtnppd rtnppd 2>/dev/null
+adduser -S -H -h /var/run/rtnppd -s /sbin/nologin -G rtnppd -g rtnppd rtnppd 2>/dev/null
 
 exit 0
diff --git a/main/rtpproxy/rtpproxy.pre-install b/main/rtpproxy/rtpproxy.pre-install
index 93a10a8..939be22 100644
--- a/main/rtpproxy/rtpproxy.pre-install
+++ b/main/rtpproxy/rtpproxy.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rtpproxy 2>/dev/null
-adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin -g rtpproxy rtpproxy 2>/dev/null
+adduser -S -H -h /usr/share/rtpproxy -s /sbin/nologin -G rtpproxy -g rtpproxy rtpproxy 2>/dev/null
 
 exit 0
diff --git a/main/sems/sems.pre-install b/main/sems/sems.pre-install
index 83d4f74..5fe904d 100644
--- a/main/sems/sems.pre-install
+++ b/main/sems/sems.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sems 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -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 c9db472..139b023 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sircbot 2>/dev/null
-adduser -S -h /var/run/sircbot -G sircbot -D -g sircbot sircbot 2>/dev/null
+adduser -S -D -h /var/run/sircbot -G sircbot -g sircbot sircbot 2>/dev/null
 
 exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index f13ff10..9c470e2 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S smokeping 2>/dev/null
-adduser -S -h /var/lib/smokeping -D -G smokeping -g smokeping smokeping 2>/dev/null
+adduser -S -D -h /var/lib/smokeping -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 e0c65c8..156454e 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt 2>/dev/null
+adduser -S -D -h /var/spool/snmptt -s /sbin/nologin -g snmptt snmptt 2>/dev/null
 
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index bd0791b..e40838d 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/log/snort -s /sbin/nologin -D -g snort snort 2>/dev/null
+adduser -S -D -h /var/log/snort -s /sbin/nologin -g snort snort 2>/dev/null
 
 exit 0
diff --git a/main/strongswan/strongswan.pre-install b/main/strongswan/strongswan.pre-install
index 83b9328..da43ede 100644
--- a/main/strongswan/strongswan.pre-install
+++ b/main/strongswan/strongswan.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S ipsec 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec -g ipsec ipsec 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -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 955baee..7091359 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S svnusers 2>/dev/null
-adduser -S -g svn svn -D -h /var/svn -G svnusers 2>/dev/null
+adduser -S -D -h /var/svn -G svnusers -g svn svn 2>/dev/null
 
 exit 0
diff --git a/main/tinyproxy/tinyproxy.pre-install b/main/tinyproxy/tinyproxy.pre-install
index b21324a..d2e1d62 100755
--- a/main/tinyproxy/tinyproxy.pre-install
+++ b/main/tinyproxy/tinyproxy.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S tinyproxy 2>/dev/null
-adduser -S -s /sbin/nologin -D -H -h /var/run/tinyproxy -G tinyproxy \
+adduser -S -D -H -h /var/run/tinyproxy -s /sbin/nologin -G tinyproxy \
 	-g "tinyproxy user" tinyproxy 2>/dev/null
 
 # return with success even if user already exist
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install
index 05e9f2a..40d70f6 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S tracd 2>/dev/null
-adduser -S -s /sbin/nologin -G tracd -D -H -g tracd tracd 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G tracd -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 9ccac8c..ad8a575 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/transmission -s /sbin/nologin -D -g transmission transmission 2>/dev/null
+adduser -S -D -h /var/lib/transmission -s /sbin/nologin -g transmission transmission 2>/dev/null
 
 exit 0
diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index 771aed1..adff926 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S umurmur 2>/dev/null
-adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur 2>/dev/null
+adduser -S -D -h /var/run/umurmurd -s /bin/false -G umurmur -g umurmur umurmur 2>/dev/null
 
 exit 0
diff --git a/main/unbound/unbound.pre-install b/main/unbound/unbound.pre-install
index 63c00e9..94144c7 100644
--- a/main/unbound/unbound.pre-install
+++ b/main/unbound/unbound.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S unbound 2>/dev/null
-adduser -S -s /sbin/nologin -D -H -h /etc/unbound -G unbound \
+adduser -S -D -H -h /etc/unbound -s /sbin/nologin -G unbound \
 	-g "Unbound user" unbound 2>/dev/null
 
 exit 0
diff --git a/main/varnish/varnish.pre-install b/main/varnish/varnish.pre-install
index 4e34a09..5b4f828 100644
--- a/main/varnish/varnish.pre-install
+++ b/main/varnish/varnish.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 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
+adduser -S -D -H -h /var/lib/varnish -s /sbin/nologin -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 0e42350..3c3e08d 100644
--- a/main/vde2/vde2.pre-install
+++ b/main/vde2/vde2.pre-install
_at_@ -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 -g vde2-net vde2-net 2>/dev/null
+adduser -S -D -H -h /var/run/vde2 -s /sbin/nologin -G vde2-net -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 778c27a..aed6c18 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
_at_@ -5,7 +5,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 -g vlc vlc 2>/dev/null
+adduser -S -D -h /home/vlc -s /bin/sh -G vlc -g vlc vlc 2>/dev/null
 
 # make sure vlc are in all groups
 for group in $groups; do
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
index 7cc5be2..9cc2bfb 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -g zabbix zabbix 2>/dev/null
 
 exit 0
diff --git a/main/zabbix/zabbix.pre-install b/main/zabbix/zabbix.pre-install
index 7cc5be2..9cc2bfb 100644
--- a/main/zabbix/zabbix.pre-install
+++ b/main/zabbix/zabbix.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -g zabbix zabbix 2>/dev/null
 
 exit 0
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index c314228..961dcc5 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S 3proxy 2>/dev/null
-adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -g 3proxy 3proxy 2>/dev/null
+adduser -S -D -h /var/log/3proxy -s /sbin/nologin -G 3proxy -g 3proxy 3proxy 2>/dev/null
 
 exit 0
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index e3c28ec..3803510 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S at 2>/dev/null
-adduser -S -H -s /bin/false -D -g at at 2>/dev/null
+adduser -S -D -H -s /bin/false -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 9cf75bb..3f83b38 100644
--- a/testing/bitcoin/bitcoin.pre-install
+++ b/testing/bitcoin/bitcoin.pre-install
_at_@ -1,6 +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
+adduser -S -D -H -h /var/lib/bitcoin -s /sbin/nologin -G bitcoin -g bitcoin bitcoin 2>/dev/null
 
 exit 0
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index ca33aac..695f716 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -D -H -h /home/buildbot -s /sbin/nologin -g buildbot buildbot 2>/dev/null
 
 exit 0
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index ca33aac..695f716 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -D -H -h /home/buildbot -s /sbin/nologin -g buildbot buildbot 2>/dev/null
 
 exit 0
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index eec8afe..01c4585 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
+adduser -S -D -H -s /bin/false -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 ce20da4..31249db 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
_at_@ -1,10 +1,12 @@
 #!/bin/sh
 
 addgroup -S haclient 2>/dev/null
-adduser -S -g hacluster hacluster \
+adduser -S \
 	-h /var/lib/heartbeat/cores/hacluster \
-	-G haclient \
 	-s /sbin/nologin \
+	-G haclient \
+	-g hacluster \
+	hacluster \
 	2>/dev/null
 
 exit 0
diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install
index 1b9ea9d..ea7f684 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
_at_@ -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 -g consul consul 2>/dev/null
+adduser -S -D -h /var/consul -s /sbin/nologin -G consul -g consul consul 2>/dev/null
 
 exit 0
diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install
index d11b163..8bf90b4 100644
--- a/testing/dante/dante-server.pre-install
+++ b/testing/dante/dante-server.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sockd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd -g sockd sockd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 3d4786e..c2a4511 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S qtss 2>/dev/null
-adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss 2>/dev/null
+adduser -S -D -h /var/darwinstreaming -s /bin/false -G qtss -g qtss qtss 2>/dev/null
 
 exit 0
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index bca9a6f..21650fc 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -s /bin/false -D -H -h /var/lib/dbmail -g dbmail dbmail 2>/dev/null
+adduser -S -D -H -h /var/lib/dbmail -s /bin/false -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 34a4de6..651c01f 100644
--- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
+++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
_at_@ -1,6 +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
+adduser -S -D -H -h /var/empty -s /sbin/nologin -G dnscrypt -g dnscrypt dnscrypt 2>/dev/null
 
 exit 0
diff --git a/testing/drizzle/drizzle.post-install b/testing/drizzle/drizzle.post-install
index 64016b2..ac0260b 100644
--- a/testing/drizzle/drizzle.post-install
+++ b/testing/drizzle/drizzle.post-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S drizzle 2>/dev/null
-adduser -SDHG drizzle -g drizzle drizzle 2>/dev/null
+adduser -S -D -H -G drizzle -g drizzle drizzle 2>/dev/null
 
 exit 0
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index e7a059c..e78f1e6 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/dspam -s /bin/false -D -g dspam dspam 2>/dev/null
+adduser -S -D -h /var/lib/dspam -s /bin/false -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 efda04b..61c3d72 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+adduser -S -D -H -h /var/lib/ejabberd -G ejabberd -g ejabberd ejabberd 2>/dev/null
 
 exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 54cd0d8..2e0b742 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 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 2>/dev/null
+adduser -S -D -H -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
+	-g "added by apk for elasticsearch" elastico 2>/dev/null
 
 exit 0
diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install
index 70555e4..d287d73 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
_at_@ -1,7 +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
+adduser -S -D -h /var/lib/emby -s /sbin/nologin -G emby \
+	-g "Emby media server" emby 2>/dev/null
 
 exit 0
diff --git a/testing/exim/exim.pre-install b/testing/exim/exim.pre-install
index 816ed96..fc5167c 100644
--- a/testing/exim/exim.pre-install
+++ b/testing/exim/exim.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S exim 2>/dev/null
-adduser -S -h /var/spool/exim -g "exim" -s /sbin/nologin -DHG exim exim 2>/dev/null
+adduser -S -D -H -h /var/spool/exim -s /sbin/nologin -G exim -g exim exim 2>/dev/null
 adduser exim mail 2>/dev/null
 
 exit 0
diff --git a/testing/fcron/fcron.pre-install b/testing/fcron/fcron.pre-install
index d4d66fd..b158791 100644
--- a/testing/fcron/fcron.pre-install
+++ b/testing/fcron/fcron.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -g fcron fcron -H -s /sbin/nologin 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g fcron fcron 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 8e8af59..0bd9cb7 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S gdnsd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 b1d3258..69cae04 100644
--- a/testing/gogs/gogs.pre-install
+++ b/testing/gogs/gogs.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null
+adduser -S -D -h /var/lib/gogs -s /bin/ash -G www-data -g gogs gogs 2>/dev/null
 passwd -u gogs 2>/dev/null
 
 exit 0
diff --git a/testing/h2o/h2o.pre-install b/testing/h2o/h2o.pre-install
index 92631f1..9af1c4c 100644
--- a/testing/h2o/h2o.pre-install
+++ b/testing/h2o/h2o.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -s /sbin/nologin -h /var/www -D -H -g h2o h2o 2>/dev/null 
+adduser -S -D -H -h /var/www -s /sbin/nologin -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 60789de..6fc6e21 100644
--- a/testing/knot/knot.pre-install
+++ b/testing/knot/knot.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S knot 2>/dev/null
-adduser -S -s /sbin/nologin -G knot -D -H -g knot knot 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G knot -g knot knot 2>/dev/null
 
 exit 0
diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install
index b7efe57..ab2add4 100644
--- a/testing/lightdm/lightdm.pre-install
+++ b/testing/lightdm/lightdm.pre-install
_at_@ -3,6 +3,6 @@
 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
+adduser -S -D -H -h /var/run/lightdm -s /bin/false -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 e4b14a6..83ce544 100644
--- a/testing/lizardfs/lizardfs.pre-install
+++ b/testing/lizardfs/lizardfs.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S mfs 2>/dev/null
-adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs -g mfs mfs \
+adduser -S -D -H -h /var/lib/mfs -s /sbin/nologin -G mfs -g mfs mfs \
 	2>/dev/null
 
 exit 0
diff --git a/testing/logstash/logstash.pre-install b/testing/logstash/logstash.pre-install
index 6844757..62c4f2b 100644
--- a/testing/logstash/logstash.pre-install
+++ b/testing/logstash/logstash.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /usr/share/logstash -s /sbin/nologin -D -H -g "Logstash User" \
-	-G daemon logstash 2>/dev/null
+adduser -S -D -H -h /usr/share/logstash -s /sbin/nologin \
+	-G daemon -g "Logstash User" logstash 2>/dev/null
 
 exit 0
diff --git a/testing/lshell/lshell.pre-install b/testing/lshell/lshell.pre-install
index 8aedffa..4aba075 100644
--- a/testing/lshell/lshell.pre-install
+++ b/testing/lshell/lshell.pre-install
_at_@ -1,6 +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
+adduser -S -D -H -h /var/empty -s /sbin/nologin -G lshell -g lshell lshell 2>/dev/null
 
 exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index f70964f..e73a38b 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
+adduser -S -D -h /var/cache/lusca -s /sbin/nologin -g lusca lusca 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup lusca winbind 2>/dev/null
 
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index f70964f..e73a38b 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
+adduser -S -D -h /var/cache/lusca -s /sbin/nologin -g lusca lusca 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup lusca winbind 2>/dev/null
 
diff --git a/testing/milter-greylist/milter-greylist.pre-install b/testing/milter-greylist/milter-greylist.pre-install
index c104db9..cf578f0 100644
--- a/testing/milter-greylist/milter-greylist.pre-install
+++ b/testing/milter-greylist/milter-greylist.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S smmsp 2>/dev/null
-adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp 2>/dev/null
+adduser -S -h /var/lib/milter-greylist -s /sbin/nologin -G smmsp -g smmsp smmsp 2>/dev/null
 
 exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 12b09a1..1ed56eb 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mongodb 2>/dev/null
-adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb 2>/dev/null
+adduser -S -D -h /var/lib/mongodb -s /sbin/nologin -G mongodb -g mongodb mongodb 2>/dev/null
 
 exit 0
diff --git a/testing/motion/motion.pre-install b/testing/motion/motion.pre-install
index 91a4c34..de22bc1 100644
--- a/testing/motion/motion.pre-install
+++ b/testing/motion/motion.pre-install
_at_@ -1,7 +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
+adduser -S -D -h /home/motion -s /bin/false -G motion -g motion motion 2>/dev/null
 addgroup motion video 2>/dev/null
 
 exit 0
diff --git a/testing/munin/munin-node.pre-install b/testing/munin/munin-node.pre-install
index 0680267..7352cf2 100644
--- a/testing/munin/munin-node.pre-install
+++ b/testing/munin/munin-node.pre-install
_at_@ -4,7 +4,7 @@ username=munin
 groupname="$username"
 
 addgroup -S "$username" 2>/dev/null
-adduser -S -H -h /run/"$username" -s /sbin/nologin -D -G "$groupname" \
+adduser -S -D -H -h /run/"$username" -s /sbin/nologin -G "$groupname" \
 	-g "$username" "$username" 2>/dev/null
 
 exit 0
diff --git a/testing/namecoin/namecoin.pre-install b/testing/namecoin/namecoin.pre-install
index 530d027..f41286d 100644
--- a/testing/namecoin/namecoin.pre-install
+++ b/testing/namecoin/namecoin.pre-install
_at_@ -1,6 +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
+adduser -S -D -h /var/lib/namecoin -s /sbin/nologin -G namecoin -g namecoin namecoin 2>/dev/null
 
 exit 0
diff --git a/testing/nginx-naxsi/nginx-naxsi.pre-install b/testing/nginx-naxsi/nginx-naxsi.pre-install
index 00bd0de..8512f43 100644
--- a/testing/nginx-naxsi/nginx-naxsi.pre-install
+++ b/testing/nginx-naxsi/nginx-naxsi.pre-install
_at_@ -2,8 +2,8 @@
 
 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 -g nginx nginx 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -G nginx \
+	-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 9af92bb..0fea81b 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
_at_@ -1,6 +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
+adduser -S -D -H -h /var/lib/ntop -s /sbin/nologin -G ntop -g ntop ntop 2>/dev/null
 
 exit 0
diff --git a/testing/opennebula/opennebula-node-kvm.pre-install b/testing/opennebula/opennebula-node-kvm.pre-install
index 73173a7..fa54164 100644
--- a/testing/opennebula/opennebula-node-kvm.pre-install
+++ b/testing/opennebula/opennebula-node-kvm.pre-install
_at_@ -2,8 +2,8 @@
 
 addgroup -S oneadmin 2>/dev/null
 addgroup -S libvirt 2>/dev/null
-adduser -S -D -s /bin/ash \
-	-h /var/lib/one -G oneadmin \
+adduser -S -D \
+	-h /var/lib/one -s /bin/ash -G oneadmin \
 	-g "OpenNebula user" oneadmin 2>/dev/null
 addgroup oneadmin libvirt 2>/dev/null
 addgroup oneadmin readproc 2>/dev/null
diff --git a/testing/opennebula/opennebula.pre-install b/testing/opennebula/opennebula.pre-install
index 15527eb..d54936a 100644
--- a/testing/opennebula/opennebula.pre-install
+++ b/testing/opennebula/opennebula.pre-install
_at_@ -1,8 +1,8 @@
 #!/bin/sh
 
 addgroup -S oneadmin 2>/dev/null
-adduser -S -D -s /bin/ash \
-	-H -h /var/lib/one -G oneadmin \
+adduser -S -D -H \
+	-s /bin/ash -h /var/lib/one -G oneadmin \
 	-g "OpenNebula user" oneadmin 2>/dev/null
 passwd -u oneadmin 2>/dev/null
 
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 8d07749..8eebc7b 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips 2>/dev/null
+adduser -S -D -H -h /var/empty -s /bin/false -g opensips opensips 2>/dev/null
 
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index 7c90e27..0a932aa 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 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
+adduser -S -D -H -h /var/run/openxcap -s /bin/false -G openxcap -g openxcap openxcap 2>/dev/null
 
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index bf00793..e80add6 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/empty -D -s /bin/false -g pdns pdns 2>/dev/null
+adduser -S -D -H -h /var/empty -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 c15127d..39d9cfa 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
_at_@ -4,8 +4,8 @@ addgroup -S prosody 2>/dev/null
 adduser -S -D \
 	-h /var/lib/prosody \
 	-s /sbin/nologin \
-	-g "Prosody XMPP Server" \
     -G prosody \
+	-g "Prosody XMPP Server" \
 	prosody 2>/dev/null
 
 exit 0
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index 5e7eed0..45f03d0 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null
+adduser -S -D -h /var/lib/qpage -s /bin/false -G qpage -g qpage qpage 2>/dev/null
 
 exit 0
diff --git a/testing/quicktun/quicktun.pre-install b/testing/quicktun/quicktun.pre-install
index b3c4c50..e010a88 100755
--- a/testing/quicktun/quicktun.pre-install
+++ b/testing/quicktun/quicktun.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 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
+adduser -S -D -H -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" quicktun 2>/dev/null
 
 exit 0
diff --git a/testing/radicale/radicale.pre-install b/testing/radicale/radicale.pre-install
index c15cf63..147f885 100644
--- a/testing/radicale/radicale.pre-install
+++ b/testing/radicale/radicale.pre-install
_at_@ -3,7 +3,7 @@
 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
+adduser -S -D -H -h /var/lib/$name -s /sbin/nologin -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 51e0dc8..f98f571 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S netadm 2>/dev/null
-adduser -S -h /var/rancid -s /bin/sh -G netadm -D -g rancid rancid 2>/dev/null
+adduser -S -D -h /var/rancid -s /bin/sh -G netadm -g rancid rancid 2>/dev/null
 
 exit 0
diff --git a/testing/rmilter/rmilter.pre-install b/testing/rmilter/rmilter.pre-install
index bda1a94..f84c689 100644
--- a/testing/rmilter/rmilter.pre-install
+++ b/testing/rmilter/rmilter.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rmilter 2>dev/null
-adduser -S -h /run/rmilter -g "rmilter" -s /bin/false -DHG rmilter rmilter 2>/dev/null
+adduser -S -D -H -h /run/rmilter -s /bin/false -G rmilter -g rmilter rmilter 2>/dev/null
 
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 7004829..5d2e03a 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
_at_@ -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 -D -H -s /bin/false -g rrdbotd rrdbotd 2>/dev/null
 
 exit 0
diff --git a/testing/rspamd/rspamd.pre-install b/testing/rspamd/rspamd.pre-install
index b107f1c..b37dcf3 100644
--- a/testing/rspamd/rspamd.pre-install
+++ b/testing/rspamd/rspamd.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rspamd 2>/dev/null
-adduser -S -h /var/lib/rspamd -g "rspamd" -s /bin/false -DHG rspamd rspamd 2>/dev/null
+adduser -S -D -H -h /var/lib/rspamd -s /bin/false -G rspamd -g rspamd rspamd 2>/dev/null
 
 exit 0
diff --git a/testing/sipwise-sems/sipwise-sems.pre-install b/testing/sipwise-sems/sipwise-sems.pre-install
index 83d4f74..5fe904d 100644
--- a/testing/sipwise-sems/sipwise-sems.pre-install
+++ b/testing/sipwise-sems/sipwise-sems.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sems 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -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 a663d3d..de53f60 100644
--- a/testing/socklog/socklog.post-install
+++ b/testing/socklog/socklog.post-install
_at_@ -3,7 +3,7 @@
 # Copyright 2015 Stuart Cardall (developer_at_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 -g log log 2>/dev/null
+adduser -S -D -H -h /var/empty -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 22e6f41..972669c 100644
--- a/testing/stunnel/stunnel.pre-install
+++ b/testing/stunnel/stunnel.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S stunnel 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel -g stunnel stunnel 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 5a3d4b1..bb59be1 100644
--- a/testing/tengine/tengine.pre-install
+++ b/testing/tengine/tengine.pre-install
_at_@ -2,8 +2,8 @@
 
 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 -g tengine tengine 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \
+	-G tengine -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 5a3d4b1..bb59be1 100644
--- a/testing/tengine/tengine.pre-upgrade
+++ b/testing/tengine/tengine.pre-upgrade
_at_@ -2,8 +2,8 @@
 
 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 -g tengine tengine 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \
+	-G tengine -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 12e8607..47dd3b0 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
_at_@ -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 -g thttpd thttpd 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \
+        -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 5796d11..9827f01 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/run/tor -s /sbin/nologin -D -g tor tor 2>/dev/null
+adduser -S -D -h /var/run/tor -s /sbin/nologin -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 3999c33..26f7f73 100644
--- a/testing/tvheadend-git/tvheadend-git.pre-install
+++ b/testing/tvheadend-git/tvheadend-git.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -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 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 3df21bb..20b3435 100644
--- a/testing/vault/vault.pre-install
+++ b/testing/vault/vault.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S vault 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault -g vault vault 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 e253007..2a94ede 100644
--- a/testing/vnstat/vnstat.pre-install
+++ b/testing/vnstat/vnstat.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S vnstat 2>/dev/null
-adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat -g vnstat vnstat 2>/dev/null
+adduser -S -D -H -h /var/lib/ -s /bin/false -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 07311bd..b007724 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
_at_@ -1,7 +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
+adduser -S -D -H -s /sbin/nologin -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 6a20a96..f22241a 100755
--- a/testing/x2goserver/x2goserver.pre-install
+++ b/testing/x2goserver/x2goserver.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S x2gouser 2>/dev/null
-adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser 2>/dev/null
+adduser -S -D -h /var/lib/x2go -s /bin/false -G x2gouser -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 2464f27..946f835 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 7cc5be2..9cc2bfb 100644
--- a/testing/zabbix/zabbix.pre-install
+++ b/testing/zabbix/zabbix.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 ae1da50..1946d2b 100755
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ b/unmaintained/apache-couchdb/apache-couchdb.post-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S couchdb 2>/dev/null
-adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -g couchdb couchdb 2>/dev/null
+adduser -S -D -h /var/run/couchdb -s /bin/false -G couchdb -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 efda04b..61c3d72 100644
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+adduser -S -D -H -h /var/lib/ejabberd -G ejabberd -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 b55298b..a54f3ad 100644
--- a/unmaintained/kde-workspace/kde-workspace.pre-install
+++ b/unmaintained/kde-workspace/kde-workspace.pre-install
_at_@ -3,6 +3,6 @@
 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
+adduser -S -D -H -h /var/run/kdm -s /bin/false -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 58b2a85..4120e45 100644
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ b/unmaintained/shadowircd/shadowircd.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/run/shadowircd -s /bin/false -D -g ircd ircd 2>/dev/null
+adduser -D -S -h /var/run/shadowircd -s /bin/false -g ircd ircd 2>/dev/null
 
 exit 0
-- 
2.6.6
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Sat Apr 23 2016 - 13:13:41 GMT