summaryrefslogtreecommitdiffstats
path: root/rescue/rescue
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2014-09-03 08:03:26 +0000
committerdelphij <delphij@FreeBSD.org>2014-09-03 08:03:26 +0000
commitce5601b1dab0707236932a2266952d0badef9c8c (patch)
tree513ec549d699cecb8cbcc91b5ebdb0d54623c4a7 /rescue/rescue
parentf97e8c26428e428b16028e10b20000408e09f4a5 (diff)
downloadFreeBSD-src-ce5601b1dab0707236932a2266952d0badef9c8c.zip
FreeBSD-src-ce5601b1dab0707236932a2266952d0badef9c8c.tar.gz
MFC r270189:
Add zdb into rescue environment. On amd64, this would increase the binary size by 1.1MiB and make it possible to examine zpool status offline, useful for recovery and diagnostic purposes. Submitted by: sef Obtained from: FreeNAS
Diffstat (limited to 'rescue/rescue')
-rw-r--r--rescue/rescue/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 297cd81..f1e0287 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -113,6 +113,7 @@ CRUNCH_PROGS_sbin+= ipf
.if ${MK_ZFS} != "no"
CRUNCH_PROGS_sbin+= zfs
CRUNCH_PROGS_sbin+= zpool
+CRUNCH_PROGS_usr.sbin+= zdb
.endif
# crunchgen does not like C++ programs; this should be fixed someday
@@ -123,7 +124,7 @@ CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
CRUNCH_LIBS+= -lipx
.endif
.if ${MK_ZFS} != "no"
-CRUNCH_LIBS+= -lavl -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
+CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
.endif
CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv
.if ${MK_OPENSSL} == "no"
@@ -165,6 +166,7 @@ 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
+CRUNCH_SRCDIR_zdb= ${.CURDIR}/../../cddl/usr.sbin/zdb
.endif
CRUNCH_ALIAS_reboot= fastboot halt fasthalt
CRUNCH_ALIAS_restore= rrestore
@@ -215,7 +217,7 @@ CRUNCH_ALIAS_id= groups whoami
#
CRUNCH_SRCDIRS+= usr.sbin
-CRUNCH_PROGS_usr.sbin= chroot
+CRUNCH_PROGS_usr.sbin+= chroot
CRUNCH_PROGS_usr.sbin+= chown
CRUNCH_ALIAS_chown= chgrp
OpenPOWER on IntegriCloud