svn commit: r270997 - stable/10/rescue/rescue

[Xin LI]

Author: delphij
Date: Wed Sep  3 08:03:26 2014
New Revision: 270997
URL: http://svnweb.freebsd.org/changeset/base/270997

Log:
  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

Modified:
  stable/10/rescue/rescue/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/rescue/rescue/Makefile
==============================================================================
--- stable/10/rescue/rescue/Makefile	Wed Sep  3 07:20:09 2014	(r270996)
+++ stable/10/rescue/rescue/Makefile	Wed Sep  3 08:03:26 2014	(r270997)
@@ -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 -ld
 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
 .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