diff --git a/src/sys/boot/boot2/boot1.s b/src/sys/boot/boot2/boot1.s index 4e23bfc..5d7f5b5 100755 --- a/src/sys/boot/boot2/boot1.s +++ b/src/sys/boot/boot2/boot1.s @@ -13,6 +13,8 @@ # purpose. # +# $Id$ + # Memory Locations .set MEM_REL,0x700 # Relocation address .set MEM_ARG,0x900 # Arguments diff --git a/src/sys/boot/boot2/boot2.c b/src/sys/boot/boot2/boot2.c index 2f1a8e3..e2cee62 100755 --- a/src/sys/boot/boot2/boot2.c +++ b/src/sys/boot/boot2/boot2.c @@ -17,6 +17,8 @@ * $ID: src/sys/boot/i386/boot2/boot2.c,v 1.28.2.6 2002/03/31 18:12:50 pb Exp $ */ +#include "ubixfs.h" + #include #include #include @@ -611,7 +613,7 @@ printf("sl: [%u]\n",sl); if (sl < BASE_SLICE) { for (i = 0; i < NDOSPART; i++) - if (dp[i].dp_typ == DOSPTYP_386BSD && + if (dp[i].dp_typ == DOSPTYP_UBX && (dp[i].dp_flag & 0x80 || sl < BASE_SLICE)) { sl = BASE_SLICE + i; if (dp[i].dp_flag & 0x80 || @@ -621,13 +623,13 @@ if (dsk.slice == WHOLE_DISK_SLICE) dsk.slice = sl; } - printf("dp_typ: [%u][%u][%u][%u]\n",dp->dp_typ,WHOLE_DISK_SLICE,DOSPTYP_386BSD,BASE_SLICE); + printf("dp_typ: [%u][%u][%u][%u]\n",dp->dp_typ,WHOLE_DISK_SLICE,DOSPTYP_UBX,BASE_SLICE); if (sl != WHOLE_DISK_SLICE) { if (sl != COMPATIBILITY_SLICE) dp += sl - BASE_SLICE; - printf("dp_typ: [%u][%u][%u]\n",dp->dp_typ,WHOLE_DISK_SLICE,DOSPTYP_386BSD); - if (dp->dp_typ != DOSPTYP_386BSD) { - printf("dp_typ: [%u][%u][%u]\n",dp->dp_typ,WHOLE_DISK_SLICE,DOSPTYP_386BSD); + printf("dp_typ: [%u][%u][%u]\n",dp->dp_typ,WHOLE_DISK_SLICE,DOSPTYP_UBX); + if (dp->dp_typ != DOSPTYP_UBX) { + printf("dp_typ: [%u][%u][%u]\n",dp->dp_typ,WHOLE_DISK_SLICE,DOSPTYP_UBX); printf("Invalid %s\n", "slice"); return -1; }