From ca71213709cdbd9d0f53d868cdc663150454494f Mon Sep 17 00:00:00 2001 From: delphij Date: Wed, 20 Aug 2014 00:14:41 +0000 Subject: 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 --- rescue/rescue/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'rescue') diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index a16d7f2..e991fbb 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 -- cgit v1.1 From 21974f8384dfa9b139c50161ed53db5b03017f23 Mon Sep 17 00:00:00 2001 From: nyan Date: Sun, 28 Sep 2014 08:59:38 +0000 Subject: Remove duplicate prog. --- rescue/rescue/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'rescue') diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index e991fbb..7445f29 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -137,7 +137,6 @@ CRUNCH_ALIAS_bsdlabel= disklabel .endif .if ${MACHINE} == "pc98" -CRUNCH_PROGS_sbin+= bsdlabel CRUNCH_SRCDIR_fdisk= $(.CURDIR)/../../sbin/fdisk_pc98 .endif -- cgit v1.1 From acaf3c19b5c4e065a290ec22ef496b779b092623 Mon Sep 17 00:00:00 2001 From: marcel Date: Fri, 7 Nov 2014 04:39:01 +0000 Subject: Add libxo, now needed by df(1). Pointed out by: rodrigc@ (thanks!) --- rescue/rescue/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rescue') diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 7445f29..0de7789 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -52,7 +52,7 @@ CRUNCH_SRCDIRS+= bin CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ ed expr getfacl hostname kenv kill ln ls mkdir mv \ pkill ps pwd realpath rm rmdir setfacl sh stty sync test -CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcapw -lutil +CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcapw -lutil -lxo CRUNCH_BUILDTOOLS+= bin/sh # Additional options for specific programs -- cgit v1.1