diff options
| author | jhb <jhb@FreeBSD.org> | 2009-10-14 14:13:42 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-10-14 14:13:42 +0000 |
| commit | bd58e46f9d606e63d79eab6cd6cf0d39bac88156 (patch) | |
| tree | 83589175bbf99fbf1c3fd4369ced23cc9c12a624 /sys/boot/i386 | |
| parent | d7403abaf51df70a9bae3f78e4b3f2b7a6261a6e (diff) | |
| download | FreeBSD-src-bd58e46f9d606e63d79eab6cd6cf0d39bac88156.zip FreeBSD-src-bd58e46f9d606e63d79eab6cd6cf0d39bac88156.tar.gz | |
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
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/zfsboot/zfsboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c index ca03568..a654393 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) { |
