From a60b9f07dee0ae4e9bbe34d4146661fcb33aa478 Mon Sep 17 00:00:00 2001 From: Przemyslaw Pawelczyk Date: Sat, 23 Apr 2016 13:13:39 +0200 Subject: Improve consistency of scripts using adduser/addgroup. Following rules have been applied: - script starts with shebang !#/bin/sh followed by blank line, - script ends with exit 0 prepended by blank line, - only stderr of adduser, addgroup or passwd is redirected to /dev/null, - getent passwd/group instances has been removed, - manual checking of file and group existence has been removed, - `|| true` instances has been removed. Comments and line wrapping have been preserved. --- main/vsftpd/vsftpd.pre-install | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'main/vsftpd') diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install index 0ed59d906a..c6e45f1b71 100755 --- a/main/vsftpd/vsftpd.pre-install +++ b/main/vsftpd/vsftpd.pre-install @@ -1,5 +1,7 @@ #!/bin/sh -addgroup -S ftp &>/dev/null -addgroup vsftp ftp &>/dev/null -adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp &>/dev/null + +addgroup -S ftp 2>/dev/null +addgroup vsftp ftp 2>/dev/null +adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp 2>/dev/null + exit 0 -- cgit v1.2.3