diff options
| author | Przemyslaw Pawelczyk <przemoc@zoho.com> | 2016-04-23 13:13:41 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-25 06:56:47 +0000 |
| commit | da4e96aacef5e9bd9a7dccecffdc92f588a6dd78 (patch) | |
| tree | 6121ad4aa9d1cb1aca5c3aac0fbde35f4943b50c /main | |
| parent | 8ac766921c78afe221fa463b6ec07e9e4da4d520 (diff) | |
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
Diffstat (limited to 'main')
94 files changed, 100 insertions, 101 deletions
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install index 5223f9fb206..e6726829143 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 f142d894e6a..703681e0134 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 56fdfe34e03..a8d1e31bd92 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 df228c28b6f..5396c69468b 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 02414e674ba..0b09a3fa1b2 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 ef8ea56f517..490ba08f74f 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 33802cafbe7..89b2fd4ab46 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 2ed220e00c8..eea66968c1a 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 363af9d9648..4116667f104 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 363af9d9648..4116667f104 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 49e398b89f4..430f2b8b0b2 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 2dab19bc87c..8675cb94138 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 32b8fe3c314..897fb74ccaf 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 0442c39fa24..a5da8290319 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 b442a43cfd2..d1e52fb0160 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 0442c39fa24..a5da8290319 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 b442a43cfd2..d1e52fb0160 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 a58c1651000..959576dd406 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 65624f364c6..bf6ea4c1c1b 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 7cc6f41899d..2e60d1cbb04 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 b189233ae11..bd73148097d 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 c736ea0b91a..2623d00c565 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 83ba7f045e3..2e0b83989ba 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 15d591dd1d2..ef4cf195d1b 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 1b58fffa1cf..664732ca54e 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 094f0d8fc29..85ba7e7e205 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 1263e54e0f9..708c15b30cf 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 d3c346867e2..e19b1138a2b 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 b6b7e222132..11b4c57b27b 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 d9c1aed834c..ed3d409b5ad 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 8b090327209..b5a11be49eb 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 f175cd362a7..6f31b67f619 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 8e8af592f48..0bd9cb7f664 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 80a3a714c35..506ef1d8f12 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 a66e2d903db..e3a4de00829 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 22fecf465e3..078372da720 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 162855ab33c..85cefc98146 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 162855ab33c..85cefc98146 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 562611b6660..3ee9c4a0874 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 2f08491d543..ee50e3bce0c 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 e38239dd6f0..1e63e58eef4 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 80f25627635..25f2b018543 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 818fda5f029..2b33bcdbc33 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 14677b1fb60..2ab1374c764 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 4440f4ee1a4..8ff0274efe8 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 63876f7731b..c2a9d1f1392 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 4fc20e601dd..e06c1c7c1ac 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 7a7b32c0fae..e3a58210db1 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 518d9f2443f..960dfd84b88 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 934307b65a2..c0439b71ec6 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 980ed34a63d..d8be4a5a880 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 2e2dbbfa33c..eaa87fba312 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 00bd0dedfb0..8512f43ddaa 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 27bf2de7cb3..ae5b6857acf 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 bb5f05a03b4..c073447b370 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 e00f960454f..875a9fadcea 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 a94f6e083f2..f523c972153 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 58b4216dc31..b6a03db50fe 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 9af92bb5d7d..0fea81baa7b 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 a01f4fa3037..eb6b10fa415 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 c3d9986a655..6b8204b64fa 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 8cbebc19a08..b81ac7534ba 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 ff553b811f5..c072535310d 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 2b9092985ab..2e654f28dce 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 1c0b01e339b..b268e4caa67 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 d00c3eb1cd8..fc62efb3cf0 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 f70564c42f5..5f1d560e156 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 3f6c75971f7..60a2f76aaf4 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 f3b44716c34..53569ceb6e6 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 f3b44716c34..53569ceb6e6 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 01ec63dd7ad..bbfc9771822 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 44c76a2e5e1..d2e238a74f1 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 b6cbd05a13c..f7321312665 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 fe6a8268dfb..771cdbf7b62 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 88327830ab7..f6f102451ca 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 ec21795914d..7151c5d7fe8 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 93a10a866fa..939be220bb4 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 83d4f740682..5fe904da652 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 c9db4723fe4..139b023b73d 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 f13ff10901f..9c470e2a1de 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 e0c65c80206..156454e5539 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 bd0791bab21..e40838da559 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 83b93284a15..da43ede6655 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 955baeefbd6..7091359c5a8 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 b21324a9c73..d2e1d624b21 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 05e9f2a4480..40d70f69967 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 9ccac8cdc04..ad8a5752364 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 771aed1c8ec..adff9264e41 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 63c00e9cdc6..94144c78788 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 4e34a099c72..5b4f828993d 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 0e423506925..3c3e08d47bf 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 778c27a8c3a..aed6c189324 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 7cc5be2f896..9cc2bfb9089 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 7cc5be2f896..9cc2bfb9089 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 |