diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-08-20 00:14:41 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-08-20 00:14:41 +0000 |
| commit | 4c75e22659c1f8830380b8952973c8699cc6c25a (patch) | |
| tree | 15ee76115f065ebd55bb2e76f45a8bcc7be1e12e /rescue | |
| parent | 4a185fa6c9b6e0fde95dfa66609501dbfaa6d5cd (diff) | |
| download | src-4c75e22659c1f8830380b8952973c8699cc6c25a.tar.gz src-4c75e22659c1f8830380b8952973c8699cc6c25a.zip | |
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
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=270189
Diffstat (limited to 'rescue')
| -rw-r--r-- | rescue/rescue/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index a16d7f241174..e991fbbc0109 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 @@ -120,7 +121,7 @@ CRUNCH_PROGS_sbin+= zpool CRUNCH_LIBS+= -lalias -lcam -lncursesw -ldevstat -lipsec .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" @@ -158,6 +159,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 @@ -208,7 +210,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 |