Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

To enable people to mount DOS partitions on disks with no NetBSD

Browse Source 
partition, add the MBR partitions to the default (faked-up)
disklabel used by NetBSD if it can't find a real one.  If the
type of the MBR partition is one of the common DOS ones, mark the
partition as having an MSDOS filesystem.
This commit is contained in:
ghudson 1996-03-09 20:52:54 +00:00
parent c9f7e94a5c
commit 4e0c8707f7
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/i386/i386/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.18 1995/01/13 10:30:08 mycroft Exp $ */
/* $NetBSD: disksubr.c,v 1.19 1996/03/09 20:52:59 ghudson Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -43,6 +43,9 @@
#define b_cylin b_resid
int fat_types[] = { DOSPTYP_FAT12, DOSPTYP_FAT16S,
DOSPTYP_FAT16B, DOSPTYP_FAT16C, -1 };
/*
* Attempt to read a disk label from a device
* using the indicated stategy routine.
@ -66,11 +69,12 @@ readdisklabel(dev, strat, lp, osdep)
struct cpu_disklabel *osdep;
{
struct dos_partition *dp = osdep->dosparts;
struct partition *pp;
struct dkbad *bdp = &osdep->bad;
struct buf *bp;
struct disklabel *dlp;
char *msg = NULL;
int dospartoff, cyl, i;
int dospartoff, cyl, i, *ip;
/* minimal requirements for archtypal disk label */
if (lp->d_secsize == 0)
@ -109,7 +113,16 @@ readdisklabel(dev, strat, lp, osdep)
/* XXX how do we check veracity/bounds of this? */
bcopy(bp->b_data + DOSPARTOFF, dp,
NDOSPART * sizeof(*dp));
for (i = 0; i < NDOSPART; i++, dp++)
for (i = 0; i < NDOSPART; i++, dp++) {
/* Install in partition e, f, g, or h. */
pp = &lp->d_partitions[RAW_PART + 1 + i];
pp->p_offset = dp->dp_start;
pp->p_size = dp->dp_size;
for (ip = fat_types; *ip != -1; ip++) {
if (dp->dp_typ == *ip)
pp->p_fstype = FS_MSDOS;
}
/* is this ours? */
if (dp->dp_size && dp->dp_typ == DOSPTYP_386BSD
&& dospartoff == 0) {
@ -128,8 +141,9 @@ readdisklabel(dev, strat, lp, osdep)
lp->d_secpercyl =
lp->d_ntracks * lp->d_nsectors;
}
}
lp->d_npartitions = RAW_PART + 1 + i;
}
}
/* next, dig out disk label */

6
sys/arch/i386/include/disklabel.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: disklabel.h,v 1.2 1995/03/28 18:16:51 jtc Exp $ */
/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@ -59,6 +59,10 @@ struct dos_partition {
/* Known DOS partition types. */
#define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */
#define DOSPTYP_NETBSD DOSPTYP_386BSD /* NetBSD partition type (XXX) */
#define DOSPTYP_FAT12 0x1 /* 12-bit FAT */
#define DOSPTYP_FAT16S 0x4 /* 16-bit FAT, less than 32M */
#define DOSPTYP_FAT16B 0x6 /* 16-bit FAT, more than 32M */
#define DOSPTYP_FAT16C 0xe /* 16-bit FAT, CHS-mapped */
#include <sys/dkbad.h>
struct cpu_disklabel {