From 964931a5ce41731d785ec1bd5568351ff4b26259 Mon Sep 17 00:00:00 2001 From: brd Date: Thu, 20 Sep 2018 09:31:27 +0000 Subject: [PATCH] Move nsmb.conf to lib/libsmb/ This leverages CONFS to do the install Approved by: re (pkgbase, blanket), bapt (mentor) Differential Revision: https://reviews.freebsd.org/D17243 --- etc/Makefile | 4 ++-- lib/libsmb/Makefile | 2 ++ {etc => lib/libsmb}/nsmb.conf | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename {etc => lib/libsmb}/nsmb.conf (100%) diff --git a/etc/Makefile b/etc/Makefile index 75a745f7b865..22339c58517e 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -70,7 +70,7 @@ distribution: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ - master.passwd nsmb.conf ${DESTDIR}/etc; + master.passwd ${DESTDIR}/etc; .if ${MK_TCSH} == "no" sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd @@ -206,7 +206,7 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY etc-examples: ${META_DEPS} cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${BIN1} ${BIN2} nsmb.conf \ + ${BIN1} ${BIN2} \ ${DESTDIR}${SHAREDIR}/examples/etc .include diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile index 519db5ff9465..3c310819f876 100644 --- a/lib/libsmb/Makefile +++ b/lib/libsmb/Makefile @@ -2,6 +2,8 @@ .include +CONFS= nsmb.conf +CONFSMODE= 600 PACKAGE=lib${LIB} CONTRIBDIR= ${SRCTOP}/contrib/smbfs .PATH: ${CONTRIBDIR}/lib/smb diff --git a/etc/nsmb.conf b/lib/libsmb/nsmb.conf similarity index 100% rename from etc/nsmb.conf rename to lib/libsmb/nsmb.conf