*** empty log message ***

This commit is contained in:
Ben Gras 2005-08-12 13:31:47 +00:00
parent 483c78ad0a
commit 695bcec49e
3 changed files with 15 additions and 7 deletions

View file

@ -1757,6 +1757,12 @@ void regionize(void)
/* Create region data used in autopart mode. */
free_regions = used_regions = nr_regions = nr_partitions = 0;
if(table[0].lowsec > table[sort_order[1]].lowsec &&
table[sort_order[1]].sysind != NO_PART) {
printf("\nSanity check failed on %s - first partition starts before disk.\n"
"Please use expert mode to correct it.\n", curdev->name);
exit(1);
}
for(si = 1; si <= NR_PARTITIONS; si++) {
i = sort_order[si];
if(i < 1 || i > NR_PARTITIONS) {
@ -1783,8 +1789,8 @@ void regionize(void)
if(autopartmode && si > 1) {
if(table[i].lowsec < table[sort_order[si-1]].lowsec ||
table[i].lowsec < table[sort_order[si-1]].lowsec + table[sort_order[si-1]].size) {
printf("Sanity check failed - partitions overlap.\n"
"Please use expert mode to correct it.\n");
printf("\nSanity check failed on %s - partitions overlap.\n"
"Please use expert mode to correct it.\n", curdev->name);
exit(1);
}
}
@ -1800,7 +1806,7 @@ void regionize(void)
}
/* Special case: space after partitions. */
if(free_sec < table[0].size-1) {
if(free_sec < table[0].lowsec + table[0].size-1) {
regions[nr_regions].free_sec_start = free_sec;
regions[nr_regions].free_sec_last = table[0].lowsec + table[0].size-1;
regions[nr_regions].is_used_part = 0;

View file

@ -1,7 +1,8 @@
MINIX 3 is still under development and may contain bugs and other
imperfections. If you would like to help develop MINIX 3 further into a
rock solid, reliable operating system, please go to the official Website:
Welcome. MINIX 3 is still under development and may contain bugs and
other imperfections. If you would like to help develop MINIX 3 further
into a rock solid, reliable operating system, please go to the official
Website:
www.minix3.org
@ -13,4 +14,5 @@ For help with MINIX 3 and discussion about it, please subscribe to the
newsgroup: comp.os.minix.
MINIX 3 supports virtual terminals. Hit ALT+F2, ALT+F3 etc. to see them.
ALT+<left arrow> and ALT+<right arrow> walks through them.

View file

@ -9,7 +9,7 @@ ISO=minix.iso
ISOGZ=minix.iso.gz
RAM=/dev/ram
BS=4096
USRMB=200
USRMB=150
USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`"
ROOTMB=2
ROOTBLOCKS="`expr $ROOTMB \* 1024 \* 1024 / $BS`"