diff options
| -rw-r--r-- | usr.sbin/sade/label.c | 18 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/label.c | 18 |
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, |
