Module Name: src
Committed By: snj
Date: Sun Feb 25 23:27:17 UTC 2018
Modified Files:
src/sys/kern [netbsd-7]: subr_tftproot.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #1573):
sys/kern/subr_tftproot.c: 1.20
Fix md(4) double attachment in TFTPROOT option
The mdattach() call in tftproot_dhcpboot() has probably always been
useless, but it seems it became harmful, as it causes 7.1.1 to deadlock
during boot.
To generate a diff of this commit:
cvs rdiff -u -r1.12.12.2 -r1.12.12.3 src/sys/kern/subr_tftproot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_tftproot.c
diff -u src/sys/kern/subr_tftproot.c:1.12.12.2 src/sys/kern/subr_tftproot.c:1.12.12.3
--- src/sys/kern/subr_tftproot.c:1.12.12.2 Mon Apr 6 01:37:29 2015
+++ src/sys/kern/subr_tftproot.c Sun Feb 25 23:27:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_tftproot.c,v 1.12.12.2 2015/04/06 01:37:29 snj Exp $ */
+/* $NetBSD: subr_tftproot.c,v 1.12.12.3 2018/02/25 23:27:17 snj Exp $ */
/*-
* Copyright (c) 2007 Emmanuel Dreyfus, all rights reserved.
@@ -39,7 +39,7 @@
#include "opt_md.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.12.12.2 2015/04/06 01:37:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.12.12.3 2018/02/25 23:27:17 snj Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -65,8 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_tftproo
#include <nfs/nfsdiskless.h>
#include <nfs/nfs_var.h>
-extern void mdattach(int);
-
/*
* Copied from <lib/libsa/tftp.h>
*/
@@ -333,7 +331,6 @@ tftproot_getfile(struct tftproot_handle
DPRINTF(("%s():%d RAMdisk loaded: %ld@%p\n",
__func__, __LINE__, trh->trh_len, trh->trh_base));
md_root_setconf(trh->trh_base, trh->trh_len);
- mdattach(0);
error = 0;
out:
