d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use CHUNK_BSD_COMPAT as God and Poul intended it be used.

Browse Source
This commit is contained in:
jkh 1995-05-18 17:38:02 +00:00
parent bb4ace843c
commit 4b6f8edf3c
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
release/sysinstall/label.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: label.c,v 1.5 1995/05/17 16:16:09 jkh Exp $
* $Id: label.c,v 1.6 1995/05/18 09:01:57 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -491,6 +491,10 @@ diskLabelEditor(char *str)
else
p = NULL;
if ((flags & CHUNK_IS_ROOT) && !(label_chunk_info[here].c->flags & CHUNK_BSD_COMPAT)) {
msgConfirm("This region cannot be used for your root partition as\nthe FreeBSD boot code cannot deal with a root partition created in\nsuch a location. Please choose another location for your root\npartition and try again!");
break;
}
tmp = Create_Chunk_DWIM(label_chunk_info[here].d,
label_chunk_info[here].c,
size, part,
@ -500,18 +504,11 @@ diskLabelEditor(char *str)
msgConfirm("Unable to create the partition. Too big?");
break;
}
else if (flags & CHUNK_IS_ROOT) {
if (tmp->flags & CHUNK_PAST_1024) {
else if ((flags & CHUNK_IS_ROOT) && (tmp->flags & CHUNK_PAST_1024)) {
msgConfirm("This region cannot be used for your root partition as it starts\nor extends past the 1024'th cylinder mark and is thus a\npoor location to boot from. Please choose another\nlocation for your root partition and try again!");
Delete_Chunk(label_chunk_info[here].d, tmp);
break;
}
else if (!(tmp->flags & CHUNK_BSD_COMPAT)) {
msgConfirm("This region cannot be used for your root partition as\nthe FreeBSD boot code cannot deal with a root partition created in\nsuch a location. Please choose another location for your root\npartition and try again!");
Delete_Chunk(label_chunk_info[here].d, tmp);
break;
}
}
tmp->private = p;
tmp->private_free = safe_free;
record_label_chunks();

15
usr.sbin/sade/label.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: label.c,v 1.5 1995/05/17 16:16:09 jkh Exp $
* $Id: label.c,v 1.6 1995/05/18 09:01:57 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -491,6 +491,10 @@ diskLabelEditor(char *str)
else
p = NULL;
if ((flags & CHUNK_IS_ROOT) && !(label_chunk_info[here].c->flags & CHUNK_BSD_COMPAT)) {
msgConfirm("This region cannot be used for your root partition as\nthe FreeBSD boot code cannot deal with a root partition created in\nsuch a location. Please choose another location for your root\npartition and try again!");
break;
}
tmp = Create_Chunk_DWIM(label_chunk_info[here].d,
label_chunk_info[here].c,
size, part,
@ -500,18 +504,11 @@ diskLabelEditor(char *str)
msgConfirm("Unable to create the partition. Too big?");
break;
}
else if (flags & CHUNK_IS_ROOT) {
if (tmp->flags & CHUNK_PAST_1024) {
else if ((flags & CHUNK_IS_ROOT) && (tmp->flags & CHUNK_PAST_1024)) {
msgConfirm("This region cannot be used for your root partition as it starts\nor extends past the 1024'th cylinder mark and is thus a\npoor location to boot from. Please choose another\nlocation for your root partition and try again!");
Delete_Chunk(label_chunk_info[here].d, tmp);
break;
}
else if (!(tmp->flags & CHUNK_BSD_COMPAT)) {
msgConfirm("This region cannot be used for your root partition as\nthe FreeBSD boot code cannot deal with a root partition created in\nsuch a location. Please choose another location for your root\npartition and try again!");
Delete_Chunk(label_chunk_info[here].d, tmp);
break;
}
}
tmp->private = p;
tmp->private_free = safe_free;
record_label_chunks();

15
usr.sbin/sysinstall/label.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: label.c,v 1.5 1995/05/17 16:16:09 jkh Exp $
* $Id: label.c,v 1.6 1995/05/18 09:01:57 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -491,6 +491,10 @@ diskLabelEditor(char *str)
else
p = NULL;
if ((flags & CHUNK_IS_ROOT) && !(label_chunk_info[here].c->flags & CHUNK_BSD_COMPAT)) {
msgConfirm("This region cannot be used for your root partition as\nthe FreeBSD boot code cannot deal with a root partition created in\nsuch a location. Please choose another location for your root\npartition and try again!");
break;
}
tmp = Create_Chunk_DWIM(label_chunk_info[here].d,
label_chunk_info[here].c,
size, part,
@ -500,18 +504,11 @@ diskLabelEditor(char *str)
msgConfirm("Unable to create the partition. Too big?");
break;
}
else if (flags & CHUNK_IS_ROOT) {
if (tmp->flags & CHUNK_PAST_1024) {
else if ((flags & CHUNK_IS_ROOT) && (tmp->flags & CHUNK_PAST_1024)) {
msgConfirm("This region cannot be used for your root partition as it starts\nor extends past the 1024'th cylinder mark and is thus a\npoor location to boot from. Please choose another\nlocation for your root partition and try again!");
Delete_Chunk(label_chunk_info[here].d, tmp);
break;
}
else if (!(tmp->flags & CHUNK_BSD_COMPAT)) {
msgConfirm("This region cannot be used for your root partition as\nthe FreeBSD boot code cannot deal with a root partition created in\nsuch a location. Please choose another location for your root\npartition and try again!");
Delete_Chunk(label_chunk_info[here].d, tmp);
break;
}
}
tmp->private = p;
tmp->private_free = safe_free;
record_label_chunks();