dot

packages and services management
Log | Files | Refs | README

commit 394b01e3c0d89c498f1e0c9dc88d4453f9c73de9
parent e591c36b261ddde6a73304b05ce57096ebd888a0
Author: Josuah Demangeon <mail@josuah.net>
Date:   Mon,  9 Jul 2018 19:40:34 +0000

fix qmail build and users

Diffstat:
Mdot/mblaze | 2+-
Mpack/gmake/tar | 2+-
Mpack/qmail/build | 3++-
Muser/qmail/add | 6+++---
Muser/useradd | 9+++++----
5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dot/mblaze b/dot/mblaze @@ -1,3 +1,3 @@ Sendmail: sendmail Local-Mailbox: mail@josuah.net -Outbox: /home/josuah/mail/INBOX +Outbox: ./mail/ diff --git a/pack/gmake/tar b/pack/gmake/tar @@ -1 +1 @@ -https://mirror.ibcp.fr/pub/gnu/make/make-4.2.tar.gz +http://ftp.gnu.org/gnu/make/make-4.2.tar.gz diff --git a/pack/qmail/build b/pack/qmail/build @@ -7,7 +7,8 @@ echo gcc -O2 -include /usr/include/errno.h >conf-cc echo "$DATA" >conf-qmail mkdir -p "$DATA" -ln -sf "$(which true)" nroff +echo '#!/bin/true' >nroff +chmod +x nroff make setup check ./config diff --git a/user/qmail/add b/user/qmail/add @@ -1,15 +1,15 @@ -#!/bin/sh -e +#!/bin/sh # qmail control and queues mkdir -p /s6/qmail/data/ -! groupadd nofiles +groupadd nofiles useradd -g nofiles -d /s6/qmail/data/alias/ -s "$(which true)" alias useradd -g nofiles -d /s6/qmail/data/ -s "$(which true)" qmaild useradd -g nofiles -d /s6/qmail/data/ -s "$(which true)" qmaill useradd -g nofiles -d /s6/qmail/data/ -s "$(which true)" qmailp -! groupadd qmail +groupadd qmail useradd -g qmail -d /s6/qmail/data/ -s "$(which true)" qmailq useradd -g qmail -d /s6/qmail/data/ -s "$(which true)" qmailr useradd -g qmail -d /s6/qmail/data/ -s "$(which true)" qmails diff --git a/user/useradd b/user/useradd @@ -3,11 +3,12 @@ IFS=' ' -argv=useradd - -while [ $# -gt 0 ] -do [ "$1" = -d ] arg=-h || arg=$1 +argv=adduser +while test $# -gt 0 +do test "$1" = -d && arg=-h || arg=$1 argv=$argv$IFS$arg + printf . + shift done exec $argv