From a77d37dba40b111e41973af8f8096fbcd75c7f84 Mon Sep 17 00:00:00 2001 From: brd Date: Tue, 31 Jul 2018 16:39:38 +0000 Subject: [PATCH] Move blacklistd.conf to usr.sbin/blacklistd/ This is prep for pkging base and helps tag and install config files with the correct packages. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D16493 --- etc/Makefile | 4 ---- usr.sbin/blacklistd/Makefile | 1 + {etc => usr.sbin/blacklistd}/blacklistd.conf | 0 3 files changed, 1 insertion(+), 4 deletions(-) rename {etc => usr.sbin/blacklistd}/blacklistd.conf (100%) diff --git a/etc/Makefile b/etc/Makefile index 320bdc8abc6..d2c74a73fa7 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -74,10 +74,6 @@ BIN1+= amd.map BIN1+= auto_master .endif -.if ${MK_BLACKLIST} != "no" -BIN1+= blacklistd.conf -.endif - .if ${MK_FREEBSD_UPDATE} != "no" BIN1+= freebsd-update.conf .endif diff --git a/usr.sbin/blacklistd/Makefile b/usr.sbin/blacklistd/Makefile index 6f2b64476a1..8c9a354a7fb 100644 --- a/usr.sbin/blacklistd/Makefile +++ b/usr.sbin/blacklistd/Makefile @@ -3,6 +3,7 @@ BLACKLIST_DIR=${SRCTOP}/contrib/blacklist .PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port +CONFS= blacklistd.conf PROG= blacklistd SRCS= blacklistd.c conf.c run.c state.c support.c internal.c \ sockaddr_snprintf.c pidfile.c strtoi.c popenve.c diff --git a/etc/blacklistd.conf b/usr.sbin/blacklistd/blacklistd.conf similarity index 100% rename from etc/blacklistd.conf rename to usr.sbin/blacklistd/blacklistd.conf -- 2.45.0