From owner-svn-src-all@FreeBSD.ORG  Sat Jun 13 22:02:55 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9DDBA106566B;
	Sat, 13 Jun 2009 22:02:55 +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 8B7448FC16;
	Sat, 13 Jun 2009 22:02:55 +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 n5DM2thI025448;
	Sat, 13 Jun 2009 22:02:55 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DM2tQi025447;
	Sat, 13 Jun 2009 22:02:55 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906132202.n5DM2tQi025447@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 13 Jun 2009 22:02:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194131 - stable/7/sys/boot/i386/loader
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 22:02:56 -0000

Author: kmacy
Date: Sat Jun 13 22:02:55 2009
New Revision: 194131
URL: http://svn.freebsd.org/changeset/base/194131

Log:
  comment out zfs support until I have time for a proper fix

Modified:
  stable/7/sys/boot/i386/loader/Makefile

Modified: stable/7/sys/boot/i386/loader/Makefile
==============================================================================
--- stable/7/sys/boot/i386/loader/Makefile	Sat Jun 13 21:55:08 2009	(r194130)
+++ stable/7/sys/boot/i386/loader/Makefile	Sat Jun 13 22:02:55 2009	(r194131)
@@ -16,12 +16,12 @@ LIBFIREWIRE=	${.OBJDIR}/../libfirewire/l
 .endif
 
 # Put LOADER_ZFS_SUPPORT=yes in /etc/make.conf for ZFS support
-.if ${MK_ZFS} != "no"
-CFLAGS+=	-DLOADER_ZFS_SUPPORT
-LIBZFS=		${.OBJDIR}/../../zfs/libzfsboot.a
-.else
+#.if ${MK_ZFS} != "no"
+#CFLAGS+=	-DLOADER_ZFS_SUPPORT
+#LIBZFS=		${.OBJDIR}/../../zfs/libzfsboot.a
+#.else
 LIBZFS=
-.endif
+#.endif
 
 # Enable PXE TFTP or NFS support, not both.
 .if defined(LOADER_TFTP_SUPPORT)