From owner-svn-src-user@FreeBSD.ORG Sat May 23 02:31:42 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 01F9B106566C;
Sat, 23 May 2009 02:31:42 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id CA7308FC0A;
Sat, 23 May 2009 02:31:41 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4N2Vf8t026250;
Sat, 23 May 2009 02:31:41 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4N2VfQQ026249;
Sat, 23 May 2009 02:31:41 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905230231.n4N2VfQQ026249@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 23 May 2009 02:31:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r192618 - user/kmacy/releng_7_2_fcs/rescue/rescue
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 May 2009 02:31:42 -0000
Author: kmacy
Date: Sat May 23 02:31:41 2009
New Revision: 192618
URL: http://svn.freebsd.org/changeset/base/192618
Log:
Add zfs/zpool to rescue programs
Modified:
user/kmacy/releng_7_2_fcs/rescue/rescue/Makefile
Modified: user/kmacy/releng_7_2_fcs/rescue/rescue/Makefile
==============================================================================
--- user/kmacy/releng_7_2_fcs/rescue/rescue/Makefile Sat May 23 00:47:23 2009 (r192617)
+++ user/kmacy/releng_7_2_fcs/rescue/rescue/Makefile Sat May 23 02:31:41 2009 (r192618)
@@ -71,7 +71,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 pax 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
.if ${MK_OPENSSL} != "no"
CRUNCH_LIBS+= -lcrypto
.endif
@@ -129,6 +129,10 @@ CRUNCH_PROGS_sbin+= ping6
.if ${MK_IPFILTER} != "no"
CRUNCH_PROGS_sbin+= ipf
.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
# CRUNCH_PROGS+= devd
@@ -137,6 +141,9 @@ CRUNCH_LIBS+= -lalias -lcam -lcurses -ld
.if ${MK_IPX} != "no"
CRUNCH_LIBS+= -lipx
.endif
+.if ${MK_ZFS} != "no"
+CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl
+.endif
CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lreadline -lsbuf -lufs -lz
.if ${MACHINE_ARCH} == "i386"
@@ -173,6 +180,10 @@ CRUNCH_SRCDIR_fore_dnld= $(.CURDIR)/../.
CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid
CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery
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_restore= rrestore
CRUNCH_ALIAS_dump= rdump
@@ -210,6 +221,12 @@ CRUNCH_SRCDIRS+= usr.sbin
CRUNCH_PROGS_usr.sbin+= chroot
+CRUNCH_PROGS_usr.sbin+= chown
+CRUNCH_ALIAS_chown= chgrp
+
+##################################################################
+CRUNCH_LIBS+= -lm
+
##################################################################
# The following is pretty nearly a generic crunchgen-handling makefile
#