Only apply rev 1.10 (which hacks around the i386 boot2 being too big for

both ufs1 and ufs2 support) on i386.
2003-02-25 00:10:20 +00:00 · 2003-02-25 00:10:20 +00:00 · 53638b8b18
commit 53638b8b18
parent 4227865460
1 changed files with 5 additions and 0 deletions
--- a/sys/boot/common/ufsread.c
+++ b/sys/boot/common/ufsread.c
@ -28,8 +28,13 @@

 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
+#ifdef __i386__
+/* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase
+   (see sys/ufs/ffs/fs.h rev 1.39) so that i386 boot loader (boot2) can
+   support both UFS1 and UFS2 again. */
 #undef cgbase
 #define cgbase(fs, c)   ((ufs2_daddr_t)((fs)->fs_fpg * (c)))
+#endif

 /*
 * We use 4k `virtual' blocks for filesystem data, whatever the actual