svn commit: r198241 - in stable/8/sys: . amd64/include/xen boot/i386/zfsboot cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci

[John Baldwin]

Author: jhb
Date: Mon Oct 19 18:31:39 2009
New Revision: 198241
URL: http://svn.freebsd.org/changeset/base/198241

Log:
  MFC 198079:
  Use zfs_read() instead of xfsread() to read /boot.config.  xfsread() fails
  short read requests, so the result was that a /boot.config smaller than 512
  bytes was ignored.  boot2 uses fsread() instead of xfsread() to read
  /boot.config already, so this makes zfsboot more like boot2.
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/i386/zfsboot/zfsboot.c
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- stable/8/sys/boot/i386/zfsboot/zfsboot.c	Mon Oct 19 18:06:49 2009	(r198240)
+++ stable/8/sys/boot/i386/zfsboot/zfsboot.c	Mon Oct 19 18:31:39 2009	(r198241)
@@ -609,7 +609,7 @@ main(void)
 
     if (zfs_lookup(spa, PATH_CONFIG, &dn) == 0) {
 	off = 0;
-	xfsread(&dn, &off, cmd, sizeof(cmd));
+	zfs_read(spa, &dn, &off, cmd, sizeof(cmd));
     }
 
     if (*cmd) {