Module Name: src
Committed By: martin
Date: Fri May 1 11:53:08 UTC 2020
Modified Files:
src/sys/arch/hp300/stand/common [netbsd-9]: netio.c
src/sys/arch/hp300/stand/inst [netbsd-9]: version
src/sys/arch/hp300/stand/uboot [netbsd-9]: version
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #880):
sys/arch/hp300/stand/uboot/version: revision 1.21
sys/arch/hp300/stand/inst/version: revision 1.14
sys/arch/hp300/stand/common/netio.c: revision 1.17
Fix inappropriate error messages when nfs_mount() fails.
Noticed by Chris Hanson and his HP332 and confirmed on my HP425e.
Also bump revisions to denote visible changes.
Worth to pull up to netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.22.1 src/sys/arch/hp300/stand/common/netio.c
cvs rdiff -u -r1.13 -r1.13.22.1 src/sys/arch/hp300/stand/inst/version
cvs rdiff -u -r1.20 -r1.20.22.1 src/sys/arch/hp300/stand/uboot/version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/netio.c
diff -u src/sys/arch/hp300/stand/common/netio.c:1.16 src/sys/arch/hp300/stand/common/netio.c:1.16.22.1
--- src/sys/arch/hp300/stand/common/netio.c:1.16 Sat Jun 11 06:20:11 2016
+++ src/sys/arch/hp300/stand/common/netio.c Fri May 1 11:53:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netio.c,v 1.16 2016/06/11 06:20:11 dholland Exp $ */
+/* $NetBSD: netio.c,v 1.16.22.1 2020/05/01 11:53:08 martin Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -158,7 +158,6 @@ netstrategy(void *devdata, int func, dad
int
netmountroot(struct open_file *f, char *devname)
{
- int error;
struct iodesc *d;
#ifdef DEBUG
@@ -260,7 +259,8 @@ netmountroot(struct open_file *f, char *
do_nfs_mount:
/* Get the NFS file handle (mount). */
- error = nfs_mount(netdev_sock, rootip, rootpath);
+ if (nfs_mount(netdev_sock, rootip, rootpath))
+ return errno;
- return error;
+ return 0;
}
Index: src/sys/arch/hp300/stand/inst/version
diff -u src/sys/arch/hp300/stand/inst/version:1.13 src/sys/arch/hp300/stand/inst/version:1.13.22.1
--- src/sys/arch/hp300/stand/inst/version:1.13 Sun Jan 17 08:05:20 2016
+++ src/sys/arch/hp300/stand/inst/version Fri May 1 11:53:08 2020
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.13 2016/01/17 08:05:20 tsutsui Exp $
+$NetBSD: version,v 1.13.22.1 2020/05/01 11:53:08 martin Exp $
1.1: Initial version
1.2: Added support for HP-IB cartridge tapes
@@ -13,3 +13,4 @@ $NetBSD: version,v 1.13 2016/01/17 08:05
1.11: Add support for framebuffers on HP362 and HP382.
1.12: Add and fix support for HP425e mcclock, sti framebuffer, apci and dnkbd.
1.13: Disable slow gunzip CRC32 calculation.
+1.14: Fix wrong errno when nfs_mount() fails.
Index: src/sys/arch/hp300/stand/uboot/version
diff -u src/sys/arch/hp300/stand/uboot/version:1.20 src/sys/arch/hp300/stand/uboot/version:1.20.22.1
--- src/sys/arch/hp300/stand/uboot/version:1.20 Sun Jan 17 08:05:20 2016
+++ src/sys/arch/hp300/stand/uboot/version Fri May 1 11:53:07 2020
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.20 2016/01/17 08:05:20 tsutsui Exp $
+$NetBSD: version,v 1.20.22.1 2020/05/01 11:53:07 martin Exp $
1.1: Initial version
1.2: Added support for network booting
@@ -20,3 +20,4 @@ $NetBSD: version,v 1.20 2016/01/17 08:05
1.18: Add support for framebuffers on HP362 and HP382.
1.19: Add and fix support for HP425e mcclock, sti framebuffer, apci and dnkbd.
1.20: Disable slow gunzip CRC32 calculation.
+1.21: Fix wrong errno when nfs_mount() fails.
