upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

newfs_msdos: allow to work with media that doesn't have any CHS params

Browse source 
Either use parameters provided by user or make them up.
The code for faking CHS params is borrowed from disklabel code.
The logic for using user-provided and auto-guessed parameters is not
perfect, so to speak.

PR:		bin/121182
Approved by:	jhb (mentor)
This commit is contained in:
Andriy Gapon 2009-02-27 17:29:48 +00:00
parent b2c91b67b6
commit d461b46dd5
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sbin/newfs_msdos/newfs_msdos.c
View file

@ -793,13 +793,25 @@ getdiskinfo(int fd, const char *fname, const char *dtype, __unused int oflag,
/* Maybe it's a fixed drive */
if (lp == NULL) {
if (ioctl(fd, DIOCGDINFO, &dlp) == -1) {
if (ioctl(fd, DIOCGSECTORSIZE, &dlp.d_secsize) == -1)
if (bpb->bps == 0 && ioctl(fd, DIOCGSECTORSIZE, &dlp.d_secsize) == -1)
errx(1, "Cannot get sector size, %s", strerror(errno));
if (ioctl(fd, DIOCGFWSECTORS, &dlp.d_nsectors) == -1)
errx(1, "Cannot get number of sectors, %s", strerror(errno));
if (ioctl(fd, DIOCGFWHEADS, &dlp.d_ntracks)== -1)
errx(1, "Cannot get number of heads, %s", strerror(errno));
/* XXX Should we use bpb->bps if it's set? */
dlp.d_secperunit = ms / dlp.d_secsize;
if (bpb->spt == 0 && ioctl(fd, DIOCGFWSECTORS, &dlp.d_nsectors) == -1) {
warnx("Cannot get number of sectors per track, %s", strerror(errno));
dlp.d_nsectors = 63;
}
if (bpb->hds == 0 && ioctl(fd, DIOCGFWHEADS, &dlp.d_ntracks) == -1) {
warnx("Cannot get number of heads, %s", strerror(errno));
if (dlp.d_secperunit <= 63*1*1024)
dlp.d_ntracks = 1;
else if (dlp.d_secperunit <= 63*16*1024)
dlp.d_ntracks = 16;
else
dlp.d_ntracks = 255;
}
}
hs = (ms / dlp.d_secsize) - dlp.d_secperunit;