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

Try to open the file before configuring a vnode disk device to avoid silly

Browse Source 
error messages when the file cannot be opened for some reason. This fixes
PR bin/12445 by <knotwell@ix.netcom.com>.
This commit is contained in:
tron 2001-11-08 07:44:32 +00:00
parent 9cc2cb211f
commit 316d7126f6
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
usr.sbin/vnconfig/vnconfig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vnconfig.c,v 1.22 2001/11/08 02:14:09 christos Exp $ */ /* $NetBSD: vnconfig.c,v 1.23 2001/11/08 07:44:32 tron Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -205,21 +205,29 @@ config(dev, file, geom, action)
* Configure the device * Configure the device
*/ */
if (action == VND_CONFIG) { if (action == VND_CONFIG) {
rv = ioctl(fd, VNDIOCSET, &vndio); int ffd;
if (rv)
warn("%s: VNDIOCSET", rdev);
else if (verbose) {
printf("%s: %d bytes on %s", rdev, vndio.vnd_size,
file);
if (vndio.vnd_flags & VNDIOF_HASGEOM)
printf(" using geometry %d/%d/%d/%d",
vndio.vnd_geom.vng_secsize,
vndio.vnd_geom.vng_nsectors,
vndio.vnd_geom.vng_ntracks,
vndio.vnd_geom.vng_ncylinders);
printf("\n");
}
ffd = open(file, O_RDWR);
if (ffd < 0)
warn("%s", file);
else {
(void) close(ffd);
rv = ioctl(fd, VNDIOCSET, &vndio);
if (rv)
warn("%s: VNDIOCSET", rdev);
else if (verbose) {
printf("%s: %d bytes on %s", rdev,
vndio.vnd_size, file);
if (vndio.vnd_flags & VNDIOF_HASGEOM)
printf(" using geometry %d/%d/%d/%d",
vndio.vnd_geom.vng_secsize,
vndio.vnd_geom.vng_nsectors,
vndio.vnd_geom.vng_ntracks,
vndio.vnd_geom.vng_ncylinders);
printf("\n");
}
}
} }
(void) close(fd); (void) close(fd);