Since our default boot block now supports UFS1 and UFS2 even on

i386, remove the seatbelt preventing users from setting the UFS2 flag
on the root file system on i386.  This seatbelt did not exist on
other platforms.

MFC candidate.
This commit is contained in:
Robert Watson 2002-12-28 23:33:09 +00:00
parent 24fbeaf9c3
commit 1fb6584d21
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=108373
2 changed files with 4 additions and 14 deletions

View file

@ -879,13 +879,8 @@ diskLabel(Device *dev)
if ((pi != NULL) &&
(pi->newfs_type == NEWFS_UFS)) {
#ifdef __i386__
if (label_chunk_info[here].c->flags & CHUNK_IS_ROOT)
msg = MSG_NOT_APPLICABLE;
else
#endif
pi->newfs_data.newfs_ufs.ufs2 =
!pi->newfs_data.newfs_ufs.ufs2;
pi->newfs_data.newfs_ufs.ufs2 =
!pi->newfs_data.newfs_ufs.ufs2;
} else
msg = MSG_NOT_APPLICABLE;
} else

View file

@ -879,13 +879,8 @@ diskLabel(Device *dev)
if ((pi != NULL) &&
(pi->newfs_type == NEWFS_UFS)) {
#ifdef __i386__
if (label_chunk_info[here].c->flags & CHUNK_IS_ROOT)
msg = MSG_NOT_APPLICABLE;
else
#endif
pi->newfs_data.newfs_ufs.ufs2 =
!pi->newfs_data.newfs_ufs.ufs2;
pi->newfs_data.newfs_ufs.ufs2 =
!pi->newfs_data.newfs_ufs.ufs2;
} else
msg = MSG_NOT_APPLICABLE;
} else