17c17
< * $Id: boot2.c,v 1.1.1.1 1998/10/12 21:16:26 rnordier Exp $
---
> * $Id: boot2.c,v 1.2 1998/10/13 17:41:06 rnordier Exp $
64c64
< #define MAJ_WFD 1
---
> #define MAJ_WFD 1
316c316
< arg[1] != dev_nm[i][1]; i++)
---
> arg[1] != dev_nm[i][1]; i++)
324a325
> dsk.slice = WHOLE_DISK_SLICE;
326c327
< if (*arg < '0' || *arg > '4')
---
> if (*arg < '0' || *arg > '0' + NDOSPART)
504a506,508
> if (drvread(sec, DOSBBSECTOR, 1))
> return -1;
> dp = (void *)(sec + DOSPARTOFF);
505a510,521
> if (sl < BASE_SLICE) {
> for (i = 0; i < NDOSPART; i++)
> if (dp[i].dp_typ == DOSPTYP_386BSD &&
> (dp[i].dp_flag & 0x80 || sl < BASE_SLICE)) {
> sl = BASE_SLICE + i;
> if (dp[i].dp_flag & 0x80 ||
> dsk.slice == COMPATIBILITY_SLICE)
> break;
> }
> if (dsk.slice == WHOLE_DISK_SLICE)
> dsk.slice = sl;
> }
507,515d522
< if (drvread(sec, DOSBBSECTOR, 1))
< return -1;
< dp = (void *)(sec + DOSPARTOFF);
< if (sl == COMPATIBILITY_SLICE)
< for (i = 0; i < NDOSPART; i++)
< if (dp[i].dp_typ == DOSPTYP_386BSD &&
< (dp[i].dp_flag & 0x80 ||
< sl == COMPATIBILITY_SLICE))
< sl = BASE_SLICE + i;
524c531
< if (drvread(sec, dsk.start + LABELSECTOR, 1))
---
> if (drvread(sec, dsk.start + LABELSECTOR, 1))
529,530c536,537
< printf("Invalid %s\n", "label");
< return -1;
---
> printf("Invalid %s\n", "label");
> return -1;
534c541
< if (d->d_type == DTYPE_SCSI)
---
> if (d->d_type == DTYPE_SCSI)