From f4d6293c72f99950af70bf61d7f346083003e8a7 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Sat, 20 Sep 2014 06:34:34 +0000 Subject: [PATCH] Don't install /etc/rc.d/ftp-proxy unless MK_PF == yes MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division --- etc/rc.d/Makefile | 5 ++++- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index b5e14d4038f7..186c9743d665 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -44,7 +44,6 @@ FILES= DAEMON \ dumpon \ faith \ fsck \ - ftp-proxy \ ftpd \ gbde \ geli \ @@ -191,6 +190,10 @@ _opensm= opensm _sshd= sshd .endif +.if ${MK_PF} != "no" +FILES+= ftp-proxy +.endif + .if ${MK_RCMDS} != "no" FILES+= rwho .endif diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 4ff329b29fcf..67b132c1d621 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3606,6 +3606,7 @@ OLD_DIRS+=usr/share/examples/pc-sysinstall .if ${MK_PF} == no OLD_FILES+=etc/periodic/security/520.pfdenied OLD_FILES+=etc/pf.os +OLD_FILES+=etc/rc.d/ftp-proxy OLD_FILES+=sbin/pfctl OLD_FILES+=sbin/pflogd OLD_FILES+=usr/libexec/tftp-proxy