From owner-cvs-src-old@FreeBSD.ORG Fri Oct 23 18:45:14 2009 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 015921065692 for ; Fri, 23 Oct 2009 18:45:14 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E22C88FC19 for ; Fri, 23 Oct 2009 18:45:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9NIjD1o048957 for ; Fri, 23 Oct 2009 18:45:13 GMT (envelope-from rnoland@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9NIjDLq048956 for cvs-src-old@freebsd.org; Fri, 23 Oct 2009 18:45:13 GMT (envelope-from rnoland@repoman.freebsd.org) Message-Id: <200910231845.n9NIjDLq048956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rnoland@repoman.freebsd.org using -f From: Robert Noland Date: Fri, 23 Oct 2009 18:44:53 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/boot/i386/zfsboot zfsboot.c src/sys/boot/zfs zfs.c zfsimpl.c src/sys/cddl/boot/zfs zfsimpl.h X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2009 18:45:14 -0000 rnoland 2009-10-23 18:44:53 UTC FreeBSD src repository Modified files: sys/boot/i386/zfsboot zfsboot.c sys/boot/zfs zfs.c zfsimpl.c sys/cddl/boot/zfs zfsimpl.h Log: SVN rev 198420 on 2009-10-23 18:44:53Z by rnoland Correct some issues with zfs boot. - Teach it to read gang blocks. (essentially untested) If you see "ZFS: gang block detected!", please let me know, so we can either remove the printf if it works, or fix it if it doesn't. - If multiple partitions exist on a disk, probe them all. We also need to reset dsk->start to 0 to read the right sector here. - With GPT, we can have 128 partitions. - If the bootfs property has ever been set on a pool it seems that it never goes away. zpool won't allow you to add to the pool with the bootfs property set. However, if you clear the property back to default we end up getting 0 for the object number and read a bogus block pointer and fail to boot. - Fix some error printfs. The printf in the loader is only capable of c,s and u formats. - Teach printf how to display %llu Reviewed by: dfr, jhb MFC after: 2 weeks Revision Changes Path 1.5 +19 -4 src/sys/boot/i386/zfsboot/zfsboot.c 1.5 +2 -2 src/sys/boot/zfs/zfs.c 1.6 +54 -17 src/sys/boot/zfs/zfsimpl.c 1.5 +18 -0 src/sys/cddl/boot/zfs/zfsimpl.h