summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>2001-05-03 09:23:48 +0000
committerjkh <jkh@FreeBSD.org>2001-05-03 09:23:48 +0000
commit6f72b8f49faed58bd4429531ae844eb3d5e58f05 (patch)
tree1b8622d099a4ef72c1e4fa5307e45b2eef882057 /usr.sbin
parent11e8bff787cf80b774f9eb4136ea84dc96975c0f (diff)
downloadFreeBSD-src-6f72b8f49faed58bd4429531ae844eb3d5e58f05.zip
FreeBSD-src-6f72b8f49faed58bd4429531ae844eb3d5e58f05.tar.gz
Remove now obsolete check for root filesystems > cyl 1024. The boot
loader can handle such cases. Noted by: olgeni
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sade/label.c18
-rw-r--r--usr.sbin/sysinstall/label.c18
2 files changed, 8 insertions, 28 deletions
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 6af44e7..d59fcfa 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -947,20 +947,10 @@ diskLabel(Device *dev)
else
p = NULL;
- if ((flags & CHUNK_IS_ROOT)) {
- if (!(label_chunk_info[here].c->flags & CHUNK_BSD_COMPAT)) {
- msgConfirm("This region cannot be used for your root partition as the\n"
- "FreeBSD boot code cannot deal with a root partition created\n"
- "in that location. Please choose another location or smaller\n"
- "size for your root partition and try again!");
- clear_wins();
- break;
- }
- if (size < (ROOT_MIN_SIZE * ONE_MEG)) {
- msgConfirm("Warning: This is smaller than the recommended size for a\n"
- "root partition. For a variety of reasons, root\n"
- "partitions should usually be at least %dMB in size", ROOT_MIN_SIZE);
- }
+ if ((flags & CHUNK_IS_ROOT) && (size < (ROOT_MIN_SIZE * ONE_MEG))) {
+ msgConfirm("Warning: This is smaller than the recommended size for a\n"
+ "root partition. For a variety of reasons, root\n"
+ "partitions should usually be at least %dMB in size", ROOT_MIN_SIZE);
}
tmp = Create_Chunk_DWIM(label_chunk_info[here].c->disk,
label_chunk_info[here].c,
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 6af44e7..d59fcfa 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -947,20 +947,10 @@ diskLabel(Device *dev)
else
p = NULL;
- if ((flags & CHUNK_IS_ROOT)) {
- if (!(label_chunk_info[here].c->flags & CHUNK_BSD_COMPAT)) {
- msgConfirm("This region cannot be used for your root partition as the\n"
- "FreeBSD boot code cannot deal with a root partition created\n"
- "in that location. Please choose another location or smaller\n"
- "size for your root partition and try again!");
- clear_wins();
- break;
- }
- if (size < (ROOT_MIN_SIZE * ONE_MEG)) {
- msgConfirm("Warning: This is smaller than the recommended size for a\n"
- "root partition. For a variety of reasons, root\n"
- "partitions should usually be at least %dMB in size", ROOT_MIN_SIZE);
- }
+ if ((flags & CHUNK_IS_ROOT) && (size < (ROOT_MIN_SIZE * ONE_MEG))) {
+ msgConfirm("Warning: This is smaller than the recommended size for a\n"
+ "root partition. For a variety of reasons, root\n"
+ "partitions should usually be at least %dMB in size", ROOT_MIN_SIZE);
}
tmp = Create_Chunk_DWIM(label_chunk_info[here].c->disk,
label_chunk_info[here].c,
OpenPOWER on IntegriCloud