Module Name: src
Committed By: tls
Date: Sun Aug 10 07:00:33 UTC 2014
Modified Files:
src/usr.sbin/vnconfig [tls-earlyentropy]: vnconfig.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.4.1 src/usr.sbin/vnconfig/vnconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/vnconfig/vnconfig.c
diff -u src/usr.sbin/vnconfig/vnconfig.c:1.41 src/usr.sbin/vnconfig/vnconfig.c:1.41.4.1
--- src/usr.sbin/vnconfig/vnconfig.c:1.41 Sun Jun 9 13:25:40 2013
+++ src/usr.sbin/vnconfig/vnconfig.c Sun Aug 10 07:00:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vnconfig.c,v 1.41 2013/06/09 13:25:40 christos Exp $ */
+/* $NetBSD: vnconfig.c,v 1.41.4.1 2014/08/10 07:00:33 tls Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -318,9 +318,10 @@ config(char *dev, char *file, char *geom
int ffd;
ffd = open(file, readonly ? O_RDONLY : O_RDWR);
- if (ffd < 0)
+ if (ffd < 0) {
warn("%s", file);
- else {
+ rv = -1;
+ } else {
(void) close(ffd);
rv = ioctl(fd, VNDIOCSET, &vndio);
