Don't use UFS2 by default during the install process on PC98, as the

PC98 boot blocks don't support UFS2.  We keep newfs(8) defaulting to
UFS2.

Warn users that FreeBSD can only boot from a root file system smaller
than 1.5TB; hopefully this will get fixed by the patches currently
floating around on -CURRENT.

Reviewed by:	nyan

4 files changed, 36 insertions, 22 deletions

diff --git a/usr.sbin/sade/help/partition.hlp b/usr.sbin/sade/help/partition.hlp
index 9b5a822..1d62148 100644
--- a/usr.sbin/sade/help/partition.hlp
+++ b/usr.sbin/sade/help/partition.hlp
@@ -129,17 +129,20 @@ as they're being requested.
 The UNIX File System (UFS) on FreeBSD supports two different on-disk
 layouts: UFS1 and UFS2.  UFS1 was the default file system in use
 through FreeBSD 5.0-RELEASE; as of FreeBSD 5.1-RELEASE, the default
-is now UFS2.  UFS2 provides sparse inode allocation (faster
-fsck), 64-bit storage pointers (larger maximum size), and native
-extended attributes (required for ACLs, MAC, and other advanced
-security and file system services).  The selection of UFS1 or
-UFS2 must be made when the file system is created--later conversion
-is not currently possible.  UFS2 is the recommended file system, but
-if disks are to be used on older FreeBSD systems, UFS1 improves
-portability.  When dual-booting between FreeBSD 4.x or earlier and 
-FreeBSD 5.x, UFS1 file systems will be accessible from both.
-To toggle a file system to UFS1, press '1'.  To restore it to UFS2,
-press '2'.
+is now UFS2, with the exception of the PC98 platform.  UFS2 provides
+sparse inode allocation (faster fsck), 64-bit storage pointers (larger
+maximum size), and native extended attributes (required for ACLs, MAC,
+and other advanced security and file system services).  The selection
+of UFS1 or UFS2 must be made when the file system is created--later
+conversion is not currently possible.  UFS2 is the recommended file
+system, but if disks are to be used on older FreeBSD systems, UFS1
+improves portability.  When dual-booting between FreeBSD 4.x or
+earlier and FreeBSD 5.x, UFS1 file systems will be accessible from
+both.  To toggle a file system to UFS1, press '1'.  To restore it to
+UFS2, press '2'.
+
+WARNING: FreeBSD on i386 is currently unable to boot from root file
+systems larger than 1.5TB.
 
 To add additional flags to the newfs command line for UFS file
 systems, press 'N'.  These options will be specified before the
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index e2ff08c..798fb5f 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -337,7 +337,11 @@ new_part(char *mpoint, Boolean newfs)
     pi->newfs_data.newfs_ufs.acls = FALSE;
     pi->newfs_data.newfs_ufs.multilabel = FALSE;
     pi->newfs_data.newfs_ufs.softupdates = strcmp(mpoint, "/");
+#ifdef PC98
+    pi->newfs_data.newfs_ufs.ufs1 = TRUE;
+#else
     pi->newfs_data.newfs_ufs.ufs1 = FALSE;
+#endif
 
     return pi;
 }
diff --git a/usr.sbin/sysinstall/help/partition.hlp b/usr.sbin/sysinstall/help/partition.hlp
index 9b5a822..1d62148 100644
--- a/usr.sbin/sysinstall/help/partition.hlp
+++ b/usr.sbin/sysinstall/help/partition.hlp
@@ -129,17 +129,20 @@ as they're being requested.
 The UNIX File System (UFS) on FreeBSD supports two different on-disk
 layouts: UFS1 and UFS2.  UFS1 was the default file system in use
 through FreeBSD 5.0-RELEASE; as of FreeBSD 5.1-RELEASE, the default
-is now UFS2.  UFS2 provides sparse inode allocation (faster
-fsck), 64-bit storage pointers (larger maximum size), and native
-extended attributes (required for ACLs, MAC, and other advanced
-security and file system services).  The selection of UFS1 or
-UFS2 must be made when the file system is created--later conversion
-is not currently possible.  UFS2 is the recommended file system, but
-if disks are to be used on older FreeBSD systems, UFS1 improves
-portability.  When dual-booting between FreeBSD 4.x or earlier and 
-FreeBSD 5.x, UFS1 file systems will be accessible from both.
-To toggle a file system to UFS1, press '1'.  To restore it to UFS2,
-press '2'.
+is now UFS2, with the exception of the PC98 platform.  UFS2 provides
+sparse inode allocation (faster fsck), 64-bit storage pointers (larger
+maximum size), and native extended attributes (required for ACLs, MAC,
+and other advanced security and file system services).  The selection
+of UFS1 or UFS2 must be made when the file system is created--later
+conversion is not currently possible.  UFS2 is the recommended file
+system, but if disks are to be used on older FreeBSD systems, UFS1
+improves portability.  When dual-booting between FreeBSD 4.x or
+earlier and FreeBSD 5.x, UFS1 file systems will be accessible from
+both.  To toggle a file system to UFS1, press '1'.  To restore it to
+UFS2, press '2'.
+
+WARNING: FreeBSD on i386 is currently unable to boot from root file
+systems larger than 1.5TB.
 
 To add additional flags to the newfs command line for UFS file
 systems, press 'N'.  These options will be specified before the
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index e2ff08c..798fb5f 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -337,7 +337,11 @@ new_part(char *mpoint, Boolean newfs)
     pi->newfs_data.newfs_ufs.acls = FALSE;
     pi->newfs_data.newfs_ufs.multilabel = FALSE;
     pi->newfs_data.newfs_ufs.softupdates = strcmp(mpoint, "/");
+#ifdef PC98
+    pi->newfs_data.newfs_ufs.ufs1 = TRUE;
+#else
     pi->newfs_data.newfs_ufs.ufs1 = FALSE;
+#endif
 
     return pi;
 }