*** empty log message ***
This commit is contained in:
parent
483c78ad0a
commit
695bcec49e
3 changed files with 15 additions and 7 deletions
|
@ -1757,6 +1757,12 @@ void regionize(void)
|
||||||
|
|
||||||
/* Create region data used in autopart mode. */
|
/* Create region data used in autopart mode. */
|
||||||
free_regions = used_regions = nr_regions = nr_partitions = 0;
|
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++) {
|
for(si = 1; si <= NR_PARTITIONS; si++) {
|
||||||
i = sort_order[si];
|
i = sort_order[si];
|
||||||
if(i < 1 || i > NR_PARTITIONS) {
|
if(i < 1 || i > NR_PARTITIONS) {
|
||||||
|
@ -1783,8 +1789,8 @@ void regionize(void)
|
||||||
if(autopartmode && si > 1) {
|
if(autopartmode && si > 1) {
|
||||||
if(table[i].lowsec < table[sort_order[si-1]].lowsec ||
|
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) {
|
table[i].lowsec < table[sort_order[si-1]].lowsec + table[sort_order[si-1]].size) {
|
||||||
printf("Sanity check failed - partitions overlap.\n"
|
printf("\nSanity check failed on %s - partitions overlap.\n"
|
||||||
"Please use expert mode to correct it.\n");
|
"Please use expert mode to correct it.\n", curdev->name);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1800,7 +1806,7 @@ void regionize(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Special case: space after partitions. */
|
/* 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_start = free_sec;
|
||||||
regions[nr_regions].free_sec_last = table[0].lowsec + table[0].size-1;
|
regions[nr_regions].free_sec_last = table[0].lowsec + table[0].size-1;
|
||||||
regions[nr_regions].is_used_part = 0;
|
regions[nr_regions].is_used_part = 0;
|
||||||
|
|
8
etc/motd
8
etc/motd
|
@ -1,7 +1,8 @@
|
||||||
|
|
||||||
MINIX 3 is still under development and may contain bugs and other
|
Welcome. MINIX 3 is still under development and may contain bugs and
|
||||||
imperfections. If you would like to help develop MINIX 3 further into a
|
other imperfections. If you would like to help develop MINIX 3 further
|
||||||
rock solid, reliable operating system, please go to the official Website:
|
into a rock solid, reliable operating system, please go to the official
|
||||||
|
Website:
|
||||||
|
|
||||||
www.minix3.org
|
www.minix3.org
|
||||||
|
|
||||||
|
@ -13,4 +14,5 @@ For help with MINIX 3 and discussion about it, please subscribe to the
|
||||||
newsgroup: comp.os.minix.
|
newsgroup: comp.os.minix.
|
||||||
|
|
||||||
MINIX 3 supports virtual terminals. Hit ALT+F2, ALT+F3 etc. to see them.
|
MINIX 3 supports virtual terminals. Hit ALT+F2, ALT+F3 etc. to see them.
|
||||||
|
ALT+<left arrow> and ALT+<right arrow> walks through them.
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ ISO=minix.iso
|
||||||
ISOGZ=minix.iso.gz
|
ISOGZ=minix.iso.gz
|
||||||
RAM=/dev/ram
|
RAM=/dev/ram
|
||||||
BS=4096
|
BS=4096
|
||||||
USRMB=200
|
USRMB=150
|
||||||
USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`"
|
USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`"
|
||||||
ROOTMB=2
|
ROOTMB=2
|
||||||
ROOTBLOCKS="`expr $ROOTMB \* 1024 \* 1024 / $BS`"
|
ROOTBLOCKS="`expr $ROOTMB \* 1024 \* 1024 / $BS`"
|
||||||
|
|
Loading…
Reference in a new issue