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

If a disktype was specified, use the disktab information

Browse Source 
and don't try the disklabel.
Allows to create a filesystem on a floppy again.
(It is arguably another bug that DIOCGDINFO returns nonsense
for floppies.)
This commit is contained in:
drochner 2003-12-11 12:11:27 +00:00
parent 774cb2d93e
commit 7dcd19bbce
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sbin/newfs/newfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: newfs.c,v 1.76 2003/11/01 18:42:00 wiz Exp $ */
/* $NetBSD: newfs.c,v 1.77 2003/12/11 12:11:27 drochner Exp $ */
/*
* Copyright (c) 1983, 1989, 1993, 1994
@ -78,7 +78,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95";
#else
__RCSID("$NetBSD: newfs.c,v 1.76 2003/11/01 18:42:00 wiz Exp $");
__RCSID("$NetBSD: newfs.c,v 1.77 2003/12/11 12:11:27 drochner Exp $");
#endif
#endif /* not lint */
@ -686,18 +686,18 @@ getdisklabel(char *s, int fd)
{
static struct disklabel lab;
if (ioctl(fd, DIOCGDINFO, &lab) < 0) {
#ifdef COMPAT
if (disktype) {
struct disklabel *lp;
if (disktype) {
struct disklabel *lp;
unlabeled++;
lp = getdiskbyname(disktype);
if (lp == NULL)
errx(1, "%s: unknown disk type", disktype);
return (lp);
}
unlabeled++;
lp = getdiskbyname(disktype);
if (lp == NULL)
errx(1, "%s: unknown disk type", disktype);
return (lp);
}
#endif
if (ioctl(fd, DIOCGDINFO, &lab) < 0) {
warn("ioctl (GDINFO)");
errx(1, lmsg, s);
}