aboutsummaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2017-03-12 04:24:29 +0000
committerEnji Cooper <ngie@FreeBSD.org>2017-03-12 04:24:29 +0000
commit4ab40004f0976f477d5c5393da73cbb728e9f1ff (patch)
treee78833276d7abb01400f154152b4db1b741a05ae /rescue
parent2ae0afa8ee9bd35483cf785c9ba442df92ddc670 (diff)
downloadsrc-4ab40004f0976f477d5c5393da73cbb728e9f1ff.tar.gz
src-4ab40004f0976f477d5c5393da73cbb728e9f1ff.zip
Conditionally compile [additional] programs into rescue(8) if requested
Trivial oversight missed in r314240 cleanup because I enable these knobs on my test machines. MK_INET6_SUPPORT - rtsol MK_NETCAT - nc MFC after: 3 days Sponsored by: Dell EMC Isilon
Notes
Notes: svn path=/head/; revision=315113
Diffstat (limited to 'rescue')
-rw-r--r--rescue/rescue/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index dff6710b8e5b..1c86c7841036 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -98,7 +98,7 @@ CRUNCH_PROGS_sbin= badsect \
mount_msdosfs mount_nfs mount_nullfs \
mount_udf mount_unionfs newfs \
newfs_msdos nos-tun ping reboot \
- restore rcorder route rtsol savecore \
+ restore rcorder route savecore \
shutdown spppcontrol swapon sysctl tunefs umount
.if ${MK_ATM} != "no"
@@ -111,6 +111,7 @@ CRUNCH_PROGS_sbin+= ccdconfig
.if ${MK_INET6_SUPPORT} != "no"
CRUNCH_PROGS_sbin+= ping6
+CRUNCH_PROGS_sbin+= rtsol
.endif
.if ${MK_IPFILTER} != "no"
@@ -186,7 +187,7 @@ CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRUNCH -Dlint
#
CRUNCH_SRCDIRS+= usr.bin
-CRUNCH_PROGS_usr.bin= head mt nc sed tail tee
+CRUNCH_PROGS_usr.bin= head mt sed tail tee
CRUNCH_PROGS_usr.bin+= gzip
CRUNCH_ALIAS_gzip= gunzip gzcat zcat
@@ -208,6 +209,10 @@ CRUNCH_LIBS+= -lcrypto
.endif
CRUNCH_LIBS+= -lmd
+.if ${MK_NETCAT} != "no"
+CRUNCH_PROGS_usr.bin= nc
+.endif
+
.if ${MK_VI} != "no"
CRUNCH_PROGS_usr.bin+= vi
CRUNCH_ALIAS_vi= ex