From 1fb6584d211b46b23fe671c7dea4994e60f73a68 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sat, 28 Dec 2002 23:33:09 +0000 Subject: [PATCH] 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. --- usr.sbin/sade/label.c | 9 ++------- usr.sbin/sysinstall/label.c | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c index 6ef15264473..305eaada834 100644 --- a/usr.sbin/sade/label.c +++ b/usr.sbin/sade/label.c @@ -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 diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c index 6ef15264473..305eaada834 100644 --- a/usr.sbin/sysinstall/label.c +++ b/usr.sbin/sysinstall/label.c @@ -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