d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add zfs/zpool to rescue programs

Browse Source 
PR:		bin/125878
Submitted by:	nork@
MFC after:	3 days
This commit is contained in:
Kip Macy 2009-05-23 00:47:23 +00:00
parent e2b84e0308
commit 8782031576
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rescue/rescue/Makefile
View File

@ -72,7 +72,7 @@ CRUNCH_SRCDIRS+= bin
CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \
ed expr getfacl hostname kenv kill ln ls mkdir mv \ ed expr getfacl hostname kenv kill ln ls mkdir mv \
pkill ps pwd realpath rm rmdir setfacl sh stty sync test pkill ps pwd realpath rm rmdir setfacl sh stty sync test
CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lm -ltermcap -lutil CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil
# Additional options for specific programs # Additional options for specific programs
CRUNCH_ALIAS_test= [ CRUNCH_ALIAS_test= [
@ -128,6 +128,10 @@ CRUNCH_PROGS_sbin+= ping6
.if ${MK_IPFILTER} != "no" .if ${MK_IPFILTER} != "no"
CRUNCH_PROGS_sbin+= ipf CRUNCH_PROGS_sbin+= ipf
.endif .endif
.if ${MK_ZFS} != "no"
CRUNCH_PROGS_sbin+= zfs
CRUNCH_PROGS_sbin+= zpool
.endif
# crunchgen does not like C++ programs; this should be fixed someday # crunchgen does not like C++ programs; this should be fixed someday
# CRUNCH_PROGS+= devd # CRUNCH_PROGS+= devd
@ -136,6 +140,9 @@ CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
.if ${MK_IPX} != "no" .if ${MK_IPX} != "no"
CRUNCH_LIBS+= -lipx CRUNCH_LIBS+= -lipx
.endif .endif
.if ${MK_ZFS} != "no"
CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl
.endif
CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lreadline -lsbuf -lufs -lz CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lreadline -lsbuf -lufs -lz
.if ${MACHINE_ARCH} == "i386" .if ${MACHINE_ARCH} == "i386"
@ -173,6 +180,10 @@ CRUNCH_SRCDIR_fore_dnld= $(.CURDIR)/../../sbin/atm/fore_dnld
CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid
CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery
CRUNCH_SRCDIR_ipf= $(.CURDIR)/../../sbin/ipf/ipf CRUNCH_SRCDIR_ipf= $(.CURDIR)/../../sbin/ipf/ipf
.if ${MK_ZFS} != "no"
CRUNCH_SRCDIR_zfs= ${.CURDIR}/../../cddl/sbin/zfs
CRUNCH_SRCDIR_zpool= ${.CURDIR}/../../cddl/sbin/zpool
.endif
CRUNCH_ALIAS_reboot= fastboot halt fasthalt CRUNCH_ALIAS_reboot= fastboot halt fasthalt
CRUNCH_ALIAS_restore= rrestore CRUNCH_ALIAS_restore= rrestore
CRUNCH_ALIAS_dump= rdump CRUNCH_ALIAS_dump= rdump
@ -218,6 +229,8 @@ CRUNCH_PROGS_usr.sbin= chroot
CRUNCH_PROGS_usr.sbin+= chown CRUNCH_PROGS_usr.sbin+= chown
CRUNCH_ALIAS_chown= chgrp CRUNCH_ALIAS_chown= chgrp
##################################################################
CRUNCH_LIBS+= -lm
################################################################## ##################################################################
# The following is pretty nearly a generic crunchgen-handling makefile # The following is pretty nearly a generic crunchgen-handling makefile