Module Name: src
Committed By: tsutsui
Date: Sun Oct 18 06:24:22 UTC 2009
Modified Files:
src/sys/arch/sparc/stand/common: promdev.c
Log Message:
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 m...@.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc/stand/common/promdev.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/arch/sparc/stand/common/promdev.c
diff -u src/sys/arch/sparc/stand/common/promdev.c:1.22 src/sys/arch/sparc/stand/common/promdev.c:1.23
--- src/sys/arch/sparc/stand/common/promdev.c:1.22 Mon Jan 12 11:32:44 2009
+++ src/sys/arch/sparc/stand/common/promdev.c Sun Oct 18 06:24:21 2009
@@ -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.
