aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-04-23 13:13:41 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-04-25 06:56:47 +0000
commitda4e96aacef5e9bd9a7dccecffdc92f588a6dd78 (patch)
tree6121ad4aa9d1cb1aca5c3aac0fbde35f4943b50c
parent8ac766921c78afe221fa463b6ec07e9e4da4d520 (diff)
downloadaports-da4e96aacef5e9bd9a7dccecffdc92f588a6dd78.tar.gz
aports-da4e96aacef5e9bd9a7dccecffdc92f588a6dd78.tar.bz2
aports-da4e96aacef5e9bd9a7dccecffdc92f588a6dd78.tar.xz
Reorder arguments passed to addgroup/adduser in scripts.
Now all invocations have following order of arguments (if present): addgroup -S -g ... GROUP adduser -S -u ... -D -H -h ... -s ... -G ... -g ... USER
-rw-r--r--community/caddy/caddy.pre-install2
-rw-r--r--community/docker-registry/docker-registry.pre-install2
-rw-r--r--community/domoticz/domoticz.pre-install2
-rw-r--r--community/icinga2/icinga2.pre-install2
-rw-r--r--community/minetest/minetest-server.pre-install2
-rw-r--r--community/oscam/oscam.pre-install2
-rw-r--r--community/redmine/redmine.pre-install2
-rw-r--r--community/seafile/seafile-server.pre-install2
-rwxr-xr-xcommunity/smstools/smstools.pre-install2
-rw-r--r--community/sniproxy/sniproxy.pre-install2
-rw-r--r--community/syncthing/syncthing.pre-install2
-rw-r--r--community/tvheadend/tvheadend.pre-install2
-rwxr-xr-xmain/amavisd-new/amavisd-new.pre-install2
-rw-r--r--main/apache2/apache2.pre-install2
-rw-r--r--main/arpwatch/arpwatch.pre-install2
-rw-r--r--main/asterisk/asterisk.pre-install2
-rw-r--r--main/asterisk/asterisk.pre-upgrade2
-rw-r--r--main/atheme-iris/atheme-iris.pre-install2
-rw-r--r--main/avahi/avahi.pre-install5
-rw-r--r--main/backuppc/backuppc.pre-install2
-rw-r--r--main/bacula-client/bacula-client.pre-install2
-rw-r--r--main/bacula/bacula.pre-install2
-rw-r--r--main/bind/bind.pre-install2
-rw-r--r--main/charybdis/charybdis.pre-install2
-rw-r--r--main/chrony/chrony.pre-install2
-rw-r--r--main/clamav/clamav-daemon.pre-install2
-rw-r--r--main/clamav/clamav-db.pre-install2
-rw-r--r--main/clamav/freshclam.pre-install2
-rw-r--r--main/clamsmtp/clamsmtp.pre-install2
-rw-r--r--main/clamsmtp/clamsmtp.pre-upgrade2
-rw-r--r--main/coova-chilli/coova-chilli.pre-install2
-rw-r--r--main/cvechecker/cvechecker.pre-install2
-rw-r--r--main/darkhttpd/darkhttpd.pre-install2
-rw-r--r--main/dbus/dbus.pre-install2
-rw-r--r--main/dhcp/dhcp.pre-install2
-rw-r--r--main/distcc/distcc.pre-install2
-rw-r--r--main/djbdns/dnscache.pre-install2
-rw-r--r--main/djbdns/tinydns.pre-install2
-rw-r--r--main/dnsmasq/dnsmasq.pre-install2
-rw-r--r--main/dovecot/dovecot.pre-install4
-rw-r--r--main/ez-ipupdate/ez-ipupdate.pre-install2
-rw-r--r--main/fetchmail/fetchmail.pre-install2
-rw-r--r--main/freeradius/freeradius.pre-install2
-rwxr-xr-xmain/freeswitch/freeswitch.pre-install2
-rw-r--r--main/gdnsd/gdnsd.pre-install2
-rw-r--r--main/gitolite/gitolite.pre-install2
-rw-r--r--main/gnats/gnats.pre-install2
-rw-r--r--main/gross/gross.pre-install2
-rw-r--r--main/haproxy/haproxy.pre-install2
-rw-r--r--main/haproxy/haproxy.pre-upgrade2
-rw-r--r--main/icecast/icecast.pre-install2
-rw-r--r--main/ircservices/ircservices.pre-install2
-rw-r--r--main/kamailio/kamailio.pre-install2
-rw-r--r--main/lighttpd/lighttpd.pre-install2
-rw-r--r--main/logcheck/logcheck.pre-install2
-rw-r--r--main/mariadb/mariadb.pre-install2
-rw-r--r--main/memcached/memcached.pre-install2
-rw-r--r--main/mini_httpd/mini_httpd.pre-install4
-rw-r--r--main/minidlna/minidlna.pre-install2
-rw-r--r--main/mlmmj/mlmmj.pre-install2
-rw-r--r--main/mosquitto/mosquitto.pre-install2
-rw-r--r--main/mpd/mpd.pre-install2
-rwxr-xr-xmain/mumble/murmur.pre-install2
-rw-r--r--main/nagios/nagios.pre-install2
-rw-r--r--main/nginx-initscripts/nginx-initscripts.pre-install4
-rw-r--r--main/nginx/nginx-common.pre-install2
-rw-r--r--main/ngircd/ngircd.pre-install2
-rw-r--r--main/nrpe/nrpe.pre-install2
-rw-r--r--main/nsd/nsd.pre-install2
-rw-r--r--main/nss-pam-ldapd/nss-pam-ldapd.pre-install2
-rwxr-xr-xmain/ntop/ntop.pre-install2
-rw-r--r--main/openldap/openldap.pre-install4
-rw-r--r--main/openntpd/openntpd.pre-install2
-rw-r--r--main/opensmtpd/opensmtpd.pre-install4
-rw-r--r--main/openvpn/openvpn.pre-install2
-rw-r--r--main/pcsc-lite/pcsc-lite.pre-install2
-rw-r--r--main/perdition/perdition.pre-install2
-rw-r--r--main/postfix/postfix.pre-install2
-rw-r--r--main/postgrey/postgrey.pre-install2
-rw-r--r--main/privoxy/privoxy.pre-install2
-rw-r--r--main/quagga-nhrp/quagga-nhrp.pre-install2
-rw-r--r--main/quagga/quagga.pre-install2
-rw-r--r--main/quassel/quassel-core.pre-install2
-rw-r--r--main/radvd/radvd.pre-install2
-rw-r--r--main/redis/redis.pre-install2
-rw-r--r--main/rpcbind/rpcbind.pre-install2
-rw-r--r--main/rt4/rt4.pre-install2
-rw-r--r--main/rtnppd/rtnppd.pre-install2
-rw-r--r--main/rtpproxy/rtpproxy.pre-install2
-rw-r--r--main/sems/sems.pre-install2
-rw-r--r--main/sircbot/sircbot.pre-install2
-rw-r--r--main/smokeping/smokeping.pre-install2
-rw-r--r--main/snmptt/snmptt.pre-install2
-rw-r--r--main/snort/snort.pre-install2
-rw-r--r--main/strongswan/strongswan.pre-install2
-rw-r--r--main/subversion/subversion.pre-install2
-rwxr-xr-xmain/tinyproxy/tinyproxy.pre-install2
-rw-r--r--main/trac/trac.pre-install2
-rw-r--r--main/transmission/transmission-daemon.pre-install2
-rwxr-xr-xmain/umurmur/umurmur.post-install2
-rw-r--r--main/unbound/unbound.pre-install2
-rw-r--r--main/varnish/varnish.pre-install2
-rw-r--r--main/vde2/vde2.pre-install2
-rw-r--r--main/vlc/vlc-daemon.pre-install2
-rw-r--r--main/zabbix/zabbix-agent.pre-install2
-rw-r--r--main/zabbix/zabbix.pre-install2
-rw-r--r--testing/3proxy/3proxy.pre-install2
-rw-r--r--testing/at/at.pre-install2
-rw-r--r--testing/bitcoin/bitcoin.pre-install2
-rw-r--r--testing/buildbot-slave/buildbot-slave.pre-install2
-rw-r--r--testing/buildbot/buildbot.pre-install2
-rw-r--r--testing/clapf/clapf.pre-install2
-rw-r--r--testing/cluster-glue/cluster-glue.pre-install6
-rw-r--r--testing/consul/consul.pre-install2
-rw-r--r--testing/dante/dante-server.pre-install2
-rw-r--r--testing/darwin-streaming-server/darwin-streaming-server.post-install2
-rw-r--r--testing/dbmail/dbmail.pre-install2
-rw-r--r--testing/dnscrypt-proxy/dnscrypt-proxy.pre-install2
-rw-r--r--testing/drizzle/drizzle.post-install2
-rw-r--r--testing/dspam/dspam.pre-install2
-rw-r--r--testing/ejabberd/ejabberd.pre-install2
-rw-r--r--testing/elasticsearch/elasticsearch.pre-install4
-rw-r--r--testing/emby/emby.pre-install4
-rw-r--r--testing/exim/exim.pre-install2
-rw-r--r--testing/fcron/fcron.pre-install2
-rw-r--r--testing/gdnsd/gdnsd.pre-install2
-rw-r--r--testing/gogs/gogs.pre-install2
-rw-r--r--testing/h2o/h2o.pre-install2
-rw-r--r--testing/knot/knot.pre-install2
-rw-r--r--testing/lightdm/lightdm.pre-install2
-rw-r--r--testing/lizardfs/lizardfs.pre-install2
-rw-r--r--testing/logstash/logstash.pre-install4
-rw-r--r--testing/lshell/lshell.pre-install2
-rw-r--r--testing/lusca/lusca.pre-install2
-rw-r--r--testing/lusca/lusca.pre-upgrade2
-rw-r--r--testing/milter-greylist/milter-greylist.pre-install2
-rw-r--r--testing/mongodb/mongodb.pre-install2
-rw-r--r--testing/motion/motion.pre-install2
-rw-r--r--testing/munin/munin-node.pre-install2
-rw-r--r--testing/namecoin/namecoin.pre-install2
-rw-r--r--testing/nginx-naxsi/nginx-naxsi.pre-install4
-rwxr-xr-xtesting/ntopng/ntopng.pre-install2
-rw-r--r--testing/opennebula/opennebula-node-kvm.pre-install4
-rw-r--r--testing/opennebula/opennebula.pre-install4
-rw-r--r--testing/opensips/opensips.pre-install2
-rwxr-xr-xtesting/openxcap/openxcap.pre-install2
-rw-r--r--testing/pdns/pdns.pre-install2
-rw-r--r--testing/prosody/prosody.pre-install2
-rw-r--r--testing/qpage/qpage.pre-install2
-rwxr-xr-xtesting/quicktun/quicktun.pre-install2
-rw-r--r--testing/radicale/radicale.pre-install2
-rw-r--r--testing/rancid/rancid.pre-install2
-rw-r--r--testing/rmilter/rmilter.pre-install2
-rw-r--r--testing/rrdbot/rrdbot.pre-install2
-rw-r--r--testing/rspamd/rspamd.pre-install2
-rw-r--r--testing/sipwise-sems/sipwise-sems.pre-install2
-rw-r--r--testing/socklog/socklog.post-install2
-rw-r--r--testing/stunnel/stunnel.pre-install2
-rw-r--r--testing/tengine/tengine.pre-install4
-rw-r--r--testing/tengine/tengine.pre-upgrade4
-rw-r--r--testing/thttpd/thttpd.pre-install4
-rw-r--r--testing/tor/tor.pre-install2
-rw-r--r--testing/tvheadend-git/tvheadend-git.pre-install2
-rw-r--r--testing/vault/vault.pre-install2
-rw-r--r--testing/vnstat/vnstat.pre-install2
-rw-r--r--testing/wt/wt.pre-install2
-rwxr-xr-xtesting/x2goserver/x2goserver.pre-install2
-rw-r--r--testing/zabbix/zabbix-agent.pre-install2
-rw-r--r--testing/zabbix/zabbix.pre-install2
-rwxr-xr-xunmaintained/apache-couchdb/apache-couchdb.post-install2
-rw-r--r--unmaintained/ejabberd-git/ejabberd-git.pre-install2
-rw-r--r--unmaintained/kde-workspace/kde-workspace.pre-install2
-rw-r--r--unmaintained/shadowircd/shadowircd.pre-install2
173 files changed, 191 insertions, 190 deletions
diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index dc78350388..ccb4f07f8f 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
+adduser -S -D -h /var/lib/caddy -s /sbin/nologin -g caddy caddy 2>/dev/null
adduser caddy www-data 2>/dev/null
exit 0
diff --git a/community/docker-registry/docker-registry.pre-install b/community/docker-registry/docker-registry.pre-install
index 5d1fbbbed3..8c1c98636f 100644
--- a/community/docker-registry/docker-registry.pre-install
+++ b/community/docker-registry/docker-registry.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S docker-registry 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G docker-registry -g docker-registry docker-registry 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G docker-registry -g docker-registry docker-registry 2>/dev/null
exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 5162f88385..227206764f 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null
+adduser -S -D -h /var/lib/domoticz -s /sbin/nologin -g domoticz domoticz 2>/dev/null
exit 0
diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install
index 7b0002ce34..ccb5265c7f 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
@@ -2,7 +2,7 @@
addgroup -S icinga 2>/dev/null
addgroup -S icingacmd 2>/dev/null
-adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D -g icinga icinga 2>/dev/null
+adduser -S -D -H -h /var/spool/icinga2 -s /sbin/nologin -G icinga -g icinga icinga 2>/dev/null
adduser icinga icingacmd 2>/dev/null
exit 0
diff --git a/community/minetest/minetest-server.pre-install b/community/minetest/minetest-server.pre-install
index da9a025959..ec187b9ce6 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
+adduser -S -D -h /var/lib/minetest -s /sbin/nologin -G games -g minetest minetest 2>/dev/null
exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index 4e0c49a166..a9982c724b 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g oscam oscam 2>/dev/null
addgroup oscam usb 2>/dev/null
exit 0
diff --git a/community/redmine/redmine.pre-install b/community/redmine/redmine.pre-install
index 072bd1d155..8957913cfc 100644
--- a/community/redmine/redmine.pre-install
+++ b/community/redmine/redmine.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D -g redmine redmine 2>/dev/null
+adduser -S -D -H -h /usr/share/webapps/redmine -s /bin/sh -g redmine redmine 2>/dev/null
addgroup redmine www-data 2>/dev/null
exit 0
diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install
index b5c1b4f64e..7e3df0b5ef 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
@@ -3,6 +3,6 @@
SEAFILE_HOME=/var/lib/seafile
addgroup -S -g 800 seafile 2>/dev/null
-adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
+adduser -S -u 800 -D -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile seafile 2>/dev/null
exit 0
diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index 0a5106f6e5..104cf129c1 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S smsd 2>/dev/null
-adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd 2>/dev/null
+adduser -S -D -h /var/spool/sms -s /sbin/nologin -G smsd -g smsd smsd 2>/dev/null
adduser -G uucp smsd 2>/dev/null
exit 0
diff --git a/community/sniproxy/sniproxy.pre-install b/community/sniproxy/sniproxy.pre-install
index aa2f7dfca5..e0e250af6d 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S sniproxy 2>/dev/null
-adduser -S -h /var/log/sniproxy -s /bin/false -D -g sniproxy sniproxy 2>/dev/null
+adduser -S -D -h /var/log/sniproxy -s /bin/false -g sniproxy sniproxy 2>/dev/null
exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index ab337cca31..a2ee46c831 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null
+adduser -S -D -H -h /var/lib/syncthing -s /sbin/nologin -g syncthing syncthing 2>/dev/null
exit 0
diff --git a/community/tvheadend/tvheadend.pre-install b/community/tvheadend/tvheadend.pre-install
index 6b64423424..3e270cb7f2 100644
--- a/community/tvheadend/tvheadend.pre-install
+++ b/community/tvheadend/tvheadend.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
+adduser -S -H -h /usr/share/tvheadend -s /sbin/nologin -G video -g tvheadend tvheadend 2>/dev/null
addgroup tvheadend usb 2>/dev/null
exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index 5223f9fb20..e672682914 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S amavis 2>/dev/null
-adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null
+adduser -S -D -h /var/amavis -s /sbin/nologin -G amavis -g amavis amavis 2>/dev/null
exit 0
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index f142d894e6..703681e013 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www -s /sbin/nologin -D -g apache apache 2>/dev/null
+adduser -S -D -H -h /var/www -s /sbin/nologin -g apache apache 2>/dev/null
addgroup apache www-data 2>/dev/null
exit 0
diff --git a/main/arpwatch/arpwatch.pre-install b/main/arpwatch/arpwatch.pre-install
index 56fdfe34e0..a8d1e31bd9 100644
--- a/main/arpwatch/arpwatch.pre-install
+++ b/main/arpwatch/arpwatch.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g arpwatch arpwatch 2>/dev/null
exit 0
diff --git a/main/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
index df228c28b6..5396c69468 100644
--- a/main/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -S -h /var/lib/asterisk -s /sbin/nologin -D -g asterisk asterisk 2>/dev/null
+adduser -S -D -h /var/lib/asterisk -s /sbin/nologin -g asterisk asterisk 2>/dev/null
addgroup -S dialout 2>/dev/null
addgroup asterisk dialout 2>/dev/null
diff --git a/main/asterisk/asterisk.pre-upgrade b/main/asterisk/asterisk.pre-upgrade
index 02414e674b..0b09a3fa1b 100644
--- a/main/asterisk/asterisk.pre-upgrade
+++ b/main/asterisk/asterisk.pre-upgrade
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -S -h /var/lib/asterisk -s /bin/false -D -g asterisk asterisk 2>/dev/null
+adduser -S -D -h /var/lib/asterisk -s /bin/false -g asterisk asterisk 2>/dev/null
addgroup -S dialout 2>/dev/null
addgroup asterisk dialout 2>/dev/null
diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index ef8ea56f51..490ba08f74 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
+adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -g iris iris >/dev/null
exit 0
diff --git a/main/avahi/avahi.pre-install b/main/avahi/avahi.pre-install
index 33802cafbe..89b2fd4ab4 100644
--- a/main/avahi/avahi.pre-install
+++ b/main/avahi/avahi.pre-install
@@ -2,12 +2,11 @@
addgroup -S -g 28 netdev 2>/dev/null
addgroup -S -g 86 avahi 2>/dev/null
-adduser -S -u 86 \
+adduser -S -u 86 -D -H \
-h /var/run/avahi-daemon \
-s /sbin/nologin \
- -D -H \
- -g "Avahi System User" \
-G avahi \
+ -g "Avahi System User" \
avahi 2>/dev/null
exit 0
diff --git a/main/backuppc/backuppc.pre-install b/main/backuppc/backuppc.pre-install
index 2ed220e00c..eea66968c1 100644
--- a/main/backuppc/backuppc.pre-install
+++ b/main/backuppc/backuppc.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S backuppc 2>/dev/null
-adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc 2>/dev/null
+adduser -S -D -H -h /var/lib/BackupPC -s /bin/sh -G backuppc -g "BackupPC user" backuppc 2>/dev/null
exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 363af9d964..4116667f10 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
+adduser -S -D -h /var/lib/bacula/ -s /sbin/nologin -G bacula -g bacula bacula 2>/dev/null
exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 363af9d964..4116667f10 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
+adduser -S -D -h /var/lib/bacula/ -s /sbin/nologin -G bacula -g bacula bacula 2>/dev/null
exit 0
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 49e398b89f..430f2b8b0b 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S named 2>/dev/null
-adduser -S -h /etc/bind -s /sbin/nologin -G named -D -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 2dab19bc87..8675cb9413 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
@@ -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 32b8fe3c31..897fb74cca 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
@@ -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 0442c39fa2..a5da829031 100644
--- a/main/clamav/clamav-daemon.pre-install
+++ b/main/clamav/clamav-daemon.pre-install
@@ -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 b442a43cfd..d1e52fb016 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -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 0442c39fa2..a5da829031 100644
--- a/main/clamav/freshclam.pre-install
+++ b/main/clamav/freshclam.pre-install
@@ -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 b442a43cfd..d1e52fb016 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -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 a58c165100..959576dd40 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -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 65624f364c..bf6ea4c1c1 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -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 7cc6f41899..2e60d1cbb0 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
@@ -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 b189233ae1..bd73148097 100644
--- a/main/darkhttpd/darkhttpd.pre-install
+++ b/main/darkhttpd/darkhttpd.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -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 c736ea0b91..2623d00c56 100644
--- a/main/dbus/dbus.pre-install
+++ b/main/dbus/dbus.pre-install
@@ -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 83ba7f045e..2e0b83989b 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -h /var/lib/dhcp -s /sbin/nologin -D -g dhcp dhcp 2>/dev/null
+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 15d591dd1d..ef4cf195d1 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
@@ -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 1b58fffa1c..664732ca54 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
+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 094f0d8fc2..85ba7e7e20 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
+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 1263e54e0f..708c15b30c 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
@@ -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 d3c346867e..e19b1138a2 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -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 b6b7e22213..11b4c57b27 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D -g ipupdate ipupdate 2>/dev/null
+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 d9c1aed834..ed3d409b5a 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -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 8b09032720..b5a11be49e 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S radius 2>/dev/null
-adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -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 f175cd362a..6f31b67f61 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D -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 8e8af592f4..0bd9cb7f66 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
@@ -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 80a3a714c3..506ef1d8f1 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -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 a66e2d903d..e3a4de0082 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -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 22fecf465e..078372da72 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -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 162855ab33..85cefc9814 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -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 162855ab33..85cefc9814 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
@@ -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 562611b666..3ee9c4a087 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast 2>/dev/null
+adduser -S -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 2f08491d54..ee50e3bce0 100644
--- a/main/ircservices/ircservices.pre-install
+++ b/main/ircservices/ircservices.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -h /var/lib/ircservices -s /sbin/nologin -D -g ircservices ircservices 2>/dev/null
+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 e38239dd6f..1e63e58eef 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S kamailio 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio 2>/dev/null
+adduser -S -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 80f2562763..25f2b01854 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -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 818fda5f02..2b33bcdbc3 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
@@ -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 14677b1fb6..2ab1374c76 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S mysql 2>/dev/null
-adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D -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 4440f4ee1a..8ff0274efe 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -H -s /sbin/nologin -D -g memcached memcached 2>/dev/null
+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 63876f7731..c2a9d1f139 100644
--- a/main/mini_httpd/mini_httpd.pre-install
+++ b/main/mini_httpd/mini_httpd.pre-install
@@ -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 4fc20e601d..e06c1c7c1a 100644
--- a/main/minidlna/minidlna.pre-install
+++ b/main/minidlna/minidlna.pre-install
@@ -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 7a7b32c0fa..e3a58210db 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
@@ -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 518d9f2443..960dfd84b8 100644
--- a/main/mosquitto/mosquitto.pre-install
+++ b/main/mosquitto/mosquitto.pre-install
@@ -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 934307b65a..c0439b71ec 100644
--- a/main/mpd/mpd.pre-install
+++ b/main/mpd/mpd.pre-install
@@ -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 980ed34a63..d8be4a5a88 100755
--- a/main/mumble/murmur.pre-install
+++ b/main/mumble/murmur.pre-install
@@ -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 2e2dbbfa33..eaa87fba31 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
@@ -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 00bd0dedfb..8512f43dda 100644
--- a/main/nginx-initscripts/nginx-initscripts.pre-install
+++ b/main/nginx-initscripts/nginx-initscripts.pre-install
@@ -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 27bf2de7cb..ae5b6857ac 100644
--- a/main/nginx/nginx-common.pre-install
+++ b/main/nginx/nginx-common.pre-install
@@ -2,7 +2,7 @@
addgroup -Sg 82 www-data 2>/dev/null
addgroup -S nginx 2>/dev/null
-adduser -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 bb5f05a03b..c073447b37 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -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 e00f960454..875a9fadce 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -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 a94f6e083f..f523c97215 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
@@ -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 58b4216dc3..b6a03db50f 100644
--- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
+++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
@@ -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 9af92bb5d7..0fea81baa7 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
@@ -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 a01f4fa303..eb6b10fa41 100644
--- a/main/openldap/openldap.pre-install
+++ b/main/openldap/openldap.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S ldap 2>/dev/null
-adduser -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 c3d9986a65..6b8204b64f 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
@@ -2,6 +2,6 @@
# this user should be included in alpine-baselayout-1.2.
# included here for backward compability.
-adduser -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp 2>/dev/null
+adduser -S -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 8cbebc19a0..b81ac7534b 100644
--- a/main/opensmtpd/opensmtpd.pre-install
+++ b/main/opensmtpd/opensmtpd.pre-install
@@ -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 ff553b811f..c072535310 100644
--- a/main/openvpn/openvpn.pre-install
+++ b/main/openvpn/openvpn.pre-install
@@ -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 2b9092985a..2e654f28dc 100644
--- a/main/pcsc-lite/pcsc-lite.pre-install
+++ b/main/pcsc-lite/pcsc-lite.pre-install
@@ -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 1c0b01e339..b268e4caa6 100644
--- a/main/perdition/perdition.pre-install
+++ b/main/perdition/perdition.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S perdition 2>/dev/null
-adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D -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 d00c3eb1cd..fc62efb3cf 100644
--- a/main/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
@@ -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 f70564c42f..5f1d560e15 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S postgrey 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -g postgrey postgrey 2>/dev/null
+adduser -S -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 3f6c75971f..60a2f76aaf 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S privoxy 2>/dev/null
-adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D -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 f3b44716c3..53569ceb6e 100644
--- a/main/quagga-nhrp/quagga-nhrp.pre-install
+++ b/main/quagga-nhrp/quagga-nhrp.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S quagga 2>/dev/null
-adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -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 f3b44716c3..53569ceb6e 100644
--- a/main/quagga/quagga.pre-install
+++ b/main/quagga/quagga.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S quagga 2>/dev/null
-adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -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 01ec63dd7a..bbfc977182 100644
--- a/main/quassel/quassel-core.pre-install
+++ b/main/quassel/quassel-core.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -S -h /var/lib/quassel -s /sbin/nologin -D -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 44c76a2e5e..d2e238a74f 100644
--- a/main/radvd/radvd.pre-install
+++ b/main/radvd/radvd.pre-install
@@ -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 b6cbd05a13..f732131266 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -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 fe6a8268df..771cdbf7b6 100644
--- a/main/rpcbind/rpcbind.pre-install
+++ b/main/rpcbind/rpcbind.pre-install
@@ -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 88327830ab..f6f102451c 100644
--- a/main/rt4/rt4.pre-install
+++ b/main/rt4/rt4.pre-install
@@ -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 ec21795914..7151c5d7fe 100644
--- a/main/rtnppd/rtnppd.pre-install
+++ b/main/rtnppd/rtnppd.pre-install
@@ -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 93a10a866f..939be220bb 100644
--- a/main/rtpproxy/rtpproxy.pre-install
+++ b/main/rtpproxy/rtpproxy.pre-install
@@ -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 83d4f74068..5fe904da65 100644
--- a/main/sems/sems.pre-install
+++ b/main/sems/sems.pre-install
@@ -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 c9db4723fe..139b023b73 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -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 f13ff10901..9c470e2a1d 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -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 e0c65c8020..156454e553 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
@@ -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 bd0791bab2..e40838da55 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -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 83b93284a1..da43ede665 100644
--- a/main/strongswan/strongswan.pre-install
+++ b/main/strongswan/strongswan.pre-install
@@ -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 955baeefbd..7091359c5a 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S svnusers 2>/dev/null
-adduser -S -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 b21324a9c7..d2e1d624b2 100755
--- a/main/tinyproxy/tinyproxy.pre-install
+++ b/main/tinyproxy/tinyproxy.pre-install
@@ -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 05e9f2a448..40d70f6996 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
@@ -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 9ccac8cdc0..ad8a575236 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -h /var/lib/transmission -s /sbin/nologin -D -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 771aed1c8e..adff9264e4 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
@@ -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 63c00e9cdc..94144c7878 100644
--- a/main/unbound/unbound.pre-install
+++ b/main/unbound/unbound.pre-install
@@ -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 4e34a099c7..5b4f828993 100644
--- a/main/varnish/varnish.pre-install
+++ b/main/varnish/varnish.pre-install
@@ -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 0e42350692..3c3e08d47b 100644
--- a/main/vde2/vde2.pre-install
+++ b/main/vde2/vde2.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S vde2-net 2>/dev/null
-adduser -S -h /var/run/vde2 -s /sbin/nologin -G vde2-net -D -H -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 778c27a8c3..aed6c18932 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
@@ -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 7cc5be2f89..9cc2bfb908 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -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 7cc5be2f89..9cc2bfb908 100644
--- a/main/zabbix/zabbix.pre-install
+++ b/main/zabbix/zabbix.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -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 c314228962..961dcc5a75 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S 3proxy 2>/dev/null
-adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -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 e3c28ec898..3803510477 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -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 9cf75bbfb7..3f83b3810a 100644
--- a/testing/bitcoin/bitcoin.pre-install
+++ b/testing/bitcoin/bitcoin.pre-install
@@ -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 ca33aace54..695f71607b 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
@@ -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 ca33aace54..695f71607b 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
@@ -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 eec8afe4f2..01c4585c92 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -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 ce20da4102..31249dba6d 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
@@ -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 1b9ea9daab..ea7f6848ec 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
@@ -2,6 +2,6 @@
# Create consul group and user
addgroup -S consul 2>/dev/null
-adduser -S -h /var/consul -s /sbin/nologin -G consul -D -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 d11b1637c7..8bf90b40cf 100644
--- a/testing/dante/dante-server.pre-install
+++ b/testing/dante/dante-server.pre-install
@@ -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 3d4786e0ad..c2a4511d90 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
@@ -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 bca9a6fe48..21650fc928 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -s /bin/false -D -H -h /var/lib/dbmail -g dbmail dbmail 2>/dev/null
+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 34a4de62f0..651c01fe26 100644
--- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
+++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
@@ -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 64016b23f8..ac0260b2c9 100644
--- a/testing/drizzle/drizzle.post-install
+++ b/testing/drizzle/drizzle.post-install
@@ -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 e7a059cbb4..e78f1e6f34 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -S -h /var/lib/dspam -s /bin/false -D -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 efda04bed6..61c3d72f73 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -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 54cd0d8f13..2e0b742e58 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -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 70555e47b8..d287d7307f 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
@@ -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 816ed9650f..fc5167ca7d 100644
--- a/testing/exim/exim.pre-install
+++ b/testing/exim/exim.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S exim 2>/dev/null
-adduser -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 d4d66fdda2..b158791782 100644
--- a/testing/fcron/fcron.pre-install
+++ b/testing/fcron/fcron.pre-install
@@ -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 8e8af592f4..0bd9cb7f66 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
@@ -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 b1d3258c91..69cae04746 100644
--- a/testing/gogs/gogs.pre-install
+++ b/testing/gogs/gogs.pre-install
@@ -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 92631f1587..9af1c4ca67 100644
--- a/testing/h2o/h2o.pre-install
+++ b/testing/h2o/h2o.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -S -s /sbin/nologin -h /var/www -D -H -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 60789deea7..6fc6e21461 100644
--- a/testing/knot/knot.pre-install
+++ b/testing/knot/knot.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S knot 2>/dev/null
-adduser -S -s /sbin/nologin -G knot -D -H -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 b7efe57975..ab2add4883 100644
--- a/testing/lightdm/lightdm.pre-install
+++ b/testing/lightdm/lightdm.pre-install
@@ -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 e4b14a6197..83ce544575 100644
--- a/testing/lizardfs/lizardfs.pre-install
+++ b/testing/lizardfs/lizardfs.pre-install
@@ -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 6844757497..62c4f2b6d3 100644
--- a/testing/logstash/logstash.pre-install
+++ b/testing/logstash/logstash.pre-install
@@ -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 8aedffa533..4aba0754ca 100644
--- a/testing/lshell/lshell.pre-install
+++ b/testing/lshell/lshell.pre-install
@@ -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 f70964f97e..e73a38b80e 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
@@ -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 f70964f97e..e73a38b80e 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
@@ -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 c104db9a74..cf578f0068 100644
--- a/testing/milter-greylist/milter-greylist.pre-install
+++ b/testing/milter-greylist/milter-greylist.pre-install
@@ -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 12b09a1969..1ed56eb7f4 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
@@ -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 91a4c34c01..de22bc1913 100644
--- a/testing/motion/motion.pre-install
+++ b/testing/motion/motion.pre-install
@@ -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 06802674f3..7352cf2fdd 100644
--- a/testing/munin/munin-node.pre-install
+++ b/testing/munin/munin-node.pre-install
@@ -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 530d027236..f41286d1bd 100644
--- a/testing/namecoin/namecoin.pre-install
+++ b/testing/namecoin/namecoin.pre-install
@@ -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 00bd0dedfb..8512f43dda 100644
--- a/testing/nginx-naxsi/nginx-naxsi.pre-install
+++ b/testing/nginx-naxsi/nginx-naxsi.pre-install
@@ -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 9af92bb5d7..0fea81baa7 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
@@ -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 73173a745e..fa541642ec 100644
--- a/testing/opennebula/opennebula-node-kvm.pre-install
+++ b/testing/opennebula/opennebula-node-kvm.pre-install
@@ -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 15527ebc01..d54936abe7 100644
--- a/testing/opennebula/opennebula.pre-install
+++ b/testing/opennebula/opennebula.pre-install
@@ -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 8d0774990b..8eebc7b0d8 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips 2>/dev/null
+adduser -S -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 7c90e2775c..0a932aa4fe 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -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 bf00793e47..e80add6412 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -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 c15127d59d..39d9cfadda 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
@@ -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 5e7eed0842..45f03d0bd0 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -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 b3c4c5088b..e010a88732 100755
--- a/testing/quicktun/quicktun.pre-install
+++ b/testing/quicktun/quicktun.pre-install
@@ -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 c15cf63cc4..147f885175 100644
--- a/testing/radicale/radicale.pre-install
+++ b/testing/radicale/radicale.pre-install
@@ -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 51e0dc84e7..f98f571bfe 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
@@ -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 bda1a94683..f84c689dc7 100644
--- a/testing/rmilter/rmilter.pre-install
+++ b/testing/rmilter/rmilter.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S rmilter 2>dev/null
-adduser -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 7004829ad7..5d2e03ac29 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -2,6 +2,6 @@
# this user should be included in alpine-baselayout-1.2.
# included here for backward compability.
-adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd 2>/dev/null
+adduser -S -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 b107f1c2ec..b37dcf3422 100644
--- a/testing/rspamd/rspamd.pre-install
+++ b/testing/rspamd/rspamd.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S rspamd 2>/dev/null
-adduser -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 83d4f74068..5fe904da65 100644
--- a/testing/sipwise-sems/sipwise-sems.pre-install
+++ b/testing/sipwise-sems/sipwise-sems.pre-install
@@ -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 a663d3dc32..de53f609d3 100644
--- a/testing/socklog/socklog.post-install
+++ b/testing/socklog/socklog.post-install
@@ -3,7 +3,7 @@
# Copyright 2015 Stuart Cardall (developer@it-offshore.co.uk)
# Distributed under the terms of the GNU General Public License, v2 or later #
-adduser -S -H -h /var/empty -D -s /sbin/nologin -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 22e6f41594..972669c12a 100644
--- a/testing/stunnel/stunnel.pre-install
+++ b/testing/stunnel/stunnel.pre-install
@@ -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 5a3d4b1f56..bb59be1f4f 100644
--- a/testing/tengine/tengine.pre-install
+++ b/testing/tengine/tengine.pre-install
@@ -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 5a3d4b1f56..bb59be1f4f 100644
--- a/testing/tengine/tengine.pre-upgrade
+++ b/testing/tengine/tengine.pre-upgrade
@@ -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 12e860797e..47dd3b0663 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
@@ -1,8 +1,8 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
- -D -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 5796d114f9..9827f01bc1 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
@@ -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 3999c33bb8..26f7f73f69 100644
--- a/testing/tvheadend-git/tvheadend-git.pre-install
+++ b/testing/tvheadend-git/tvheadend-git.pre-install
@@ -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 3df21bb3d2..20b3435488 100644
--- a/testing/vault/vault.pre-install
+++ b/testing/vault/vault.pre-install
@@ -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 e253007d2b..2a94edea9d 100644
--- a/testing/vnstat/vnstat.pre-install
+++ b/testing/vnstat/vnstat.pre-install
@@ -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 07311bd8fd..b007724a0c 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -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 6a20a96a5c..f22241a576 100755
--- a/testing/x2goserver/x2goserver.pre-install
+++ b/testing/x2goserver/x2goserver.pre-install
@@ -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 2464f275ca..946f83512f 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
@@ -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 7cc5be2f89..9cc2bfb908 100644
--- a/testing/zabbix/zabbix.pre-install
+++ b/testing/zabbix/zabbix.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -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 ae1da50210..1946d2b5b4 100755
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ b/unmaintained/apache-couchdb/apache-couchdb.post-install
@@ -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 efda04bed6..61c3d72f73 100644
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install
@@ -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 b55298b1ea..a54f3ada6f 100644
--- a/unmaintained/kde-workspace/kde-workspace.pre-install
+++ b/unmaintained/kde-workspace/kde-workspace.pre-install
@@ -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 58b2a85c80..4120e456a6 100644
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ b/unmaintained/shadowircd/shadowircd.pre-install
@@ -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