aboutsummaryrefslogtreecommitdiff
path: root/sys/boot/i386
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2009-10-14 14:13:42 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2009-10-14 14:13:42 +0000
commita944fb4cc3de366d852a7b4b8d8226650bbb950f (patch)
tree83589175bbf99fbf1c3fd4369ced23cc9c12a624 /sys/boot/i386
parent14c129fc3e42d91b1b75348e6307614f01535843 (diff)
downloadsrc-a944fb4cc3de366d852a7b4b8d8226650bbb950f.tar.gz
src-a944fb4cc3de366d852a7b4b8d8226650bbb950f.zip
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. Submitted by: Johny Mattsson johny-freebsd of earthmagic org Reviewed by: dfr MFC after: 3 days
Notes
Notes: svn path=/head/; revision=198079
Diffstat (limited to 'sys/boot/i386')
-rw-r--r--sys/boot/i386/zfsboot/zfsboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c
index ca035683dd74..a654393f1840 100644
--- a/sys/boot/i386/zfsboot/zfsboot.c
+++ b/sys/boot/i386/zfsboot/zfsboot.c
@@ -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) {