In my continuing crusade to make life better for non-sendmail users, avoid
the creation of /var/spool/clientmqueue and therefore the need for the smmsp user and group if NO_SENDMAIL is defined. This required breaking out the creation of the directory into a new BSD.sendmail.dist mtree file. MFC after: 1 week
This commit is contained in:
parent
f8b175feba
commit
5b7a235bb6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=95144
@ -42,6 +42,9 @@ BIN2= netstart pccard_ether rc.suspend rc.resume
|
|||||||
|
|
||||||
MTREE= BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
|
MTREE= BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
|
||||||
BSD.var.dist BSD.x11.dist BSD.x11-4.dist
|
BSD.var.dist BSD.x11.dist BSD.x11-4.dist
|
||||||
|
.if !defined(NO_SENDMAIL)
|
||||||
|
MTREE+= BSD.sendmail.dist
|
||||||
|
.endif
|
||||||
NAMEDB= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \
|
NAMEDB= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \
|
||||||
make-localhost
|
make-localhost
|
||||||
PPPCNF= ppp.conf
|
PPPCNF= ppp.conf
|
||||||
@ -180,6 +183,9 @@ distrib-dirs:
|
|||||||
-p ${DESTDIR}/usr/include
|
-p ${DESTDIR}/usr/include
|
||||||
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
|
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
|
||||||
-p ${DESTDIR}/usr/libdata/perl/5.6.1/mach
|
-p ${DESTDIR}/usr/libdata/perl/5.6.1/mach
|
||||||
|
.if !defined(NO_SENDMAIL)
|
||||||
|
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
|
||||||
|
.endif
|
||||||
cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
|
cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
|
||||||
cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .
|
cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .
|
||||||
cd ${DESTDIR}/usr/share/man; \
|
cd ${DESTDIR}/usr/share/man; \
|
||||||
|
14
etc/mtree/BSD.sendmail.dist
Normal file
14
etc/mtree/BSD.sendmail.dist
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
# $FreeBSD$
|
||||||
|
#
|
||||||
|
# Please see the file src/etc/mtree/README before making changes to this file.
|
||||||
|
#
|
||||||
|
|
||||||
|
/set type=dir uname=root gname=wheel mode=0755
|
||||||
|
. nochange
|
||||||
|
var nochange
|
||||||
|
spool nochange
|
||||||
|
clientmqueue uname=smmsp gname=smmsp mode=0770
|
||||||
|
..
|
||||||
|
..
|
||||||
|
..
|
||||||
|
..
|
@ -64,8 +64,6 @@
|
|||||||
rwho gname=daemon mode=0775
|
rwho gname=daemon mode=0775
|
||||||
..
|
..
|
||||||
spool
|
spool
|
||||||
clientmqueue uname=smmsp gname=smmsp mode=0770
|
|
||||||
..
|
|
||||||
lock uname=uucp gname=dialer mode=0775
|
lock uname=uucp gname=dialer mode=0775
|
||||||
..
|
..
|
||||||
/set gname=daemon
|
/set gname=daemon
|
||||||
|
Loading…
Reference in New Issue
Block a user