[src/trunk]: src/sys/arch/sparc/stand/common Don't try to read disklabel to c...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/79a32ada013c
branches:  trunk
changeset: 748241:79a32ada013c
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Oct 18 06:24:21 2009 +0000

description:
Don't try to read disklabel to check FS_RAID on floppy boot since
reopening floppy could cause Data Access Exception later.
Fixes PR port-sparc/42186, ok'ed by mrg@.

diffstat:

 sys/arch/sparc/stand/common/promdev.c |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r db9ab089d0c8 -r 79a32ada013c sys/arch/sparc/stand/common/promdev.c
--- a/sys/arch/sparc/stand/common/promdev.c     Sun Oct 18 03:53:32 2009 +0000
+++ b/sys/arch/sparc/stand/common/promdev.c     Sun Oct 18 06:24:21 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: promdev.c,v 1.22 2009/01/12 11:32:44 tsutsui Exp $ */
+/*     $NetBSD: promdev.c,v 1.23 2009/10/18 06:24:21 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -216,6 +216,15 @@
 #endif
 
                /*
+                * Don't check disklabel on floppy boot since
+                * reopening it could cause Data Access Exception later.
+                */
+               if (strncmp(prom_bootdevice, "fd", 2) == 0 ||
+                   strstr(prom_bootdevice, "SUNW,fdtwo") != NULL ||
+                   strstr(prom_bootdevice, "fdthree") != NULL)
+                       return 0;
+
+               /*
                 * We need to read from the raw partition (i.e. the
                 * beginning of the disk in order to check the NetBSD
                 * disklabel to see if the boot partition is type RAID.