[src/trunk]: src/sys/arch/macppc/stand/ofwboot Fix boot failure from installa...

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

details:   https://anonhg.NetBSD.org/src/rev/f2b076898ff6
branches:  trunk
changeset: 445889:f2b076898ff6
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Fri Nov 16 14:58:54 2018 +0000

description:
Fix boot failure from installation floppies.  PR port-macppc/53103

Also bump version to denote a visible fix.
Should be pulled up to netbsd-8 and netbsd-7.

diffstat:

 sys/arch/macppc/stand/ofwboot/ofdev.c |  11 ++++++-----
 sys/arch/macppc/stand/ofwboot/version |   3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r bcc3cdac664e -r f2b076898ff6 sys/arch/macppc/stand/ofwboot/ofdev.c
--- a/sys/arch/macppc/stand/ofwboot/ofdev.c     Fri Nov 16 13:55:17 2018 +0000
+++ b/sys/arch/macppc/stand/ofwboot/ofdev.c     Fri Nov 16 14:58:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofdev.c,v 1.26 2012/02/19 12:02:55 tsutsui Exp $       */
+/*     $NetBSD: ofdev.c,v 1.27 2018/11/16 14:58:54 tsutsui Exp $       */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -437,10 +437,11 @@
                ofdev.type = OFDEV_DISK;
                ofdev.bsize = DEV_BSIZE;
                /* First try to find a disklabel without partitions */
-               if (strategy(&ofdev, F_READ,
-                            LABELSECTOR, DEV_BSIZE, buf, &nread) != 0
-                   || nread != DEV_BSIZE
-                   || getdisklabel(buf, &label)) {
+               if (!floppyboot &&
+                   (strategy(&ofdev, F_READ,
+                             LABELSECTOR, DEV_BSIZE, buf, &nread) != 0
+                    || nread != DEV_BSIZE
+                    || getdisklabel(buf, &label))) {
                        /* Else try APM or MBR partitions */
                        struct drvr_map *map = (struct drvr_map *)buf;
 
diff -r bcc3cdac664e -r f2b076898ff6 sys/arch/macppc/stand/ofwboot/version
--- a/sys/arch/macppc/stand/ofwboot/version     Fri Nov 16 13:55:17 2018 +0000
+++ b/sys/arch/macppc/stand/ofwboot/version     Fri Nov 16 14:58:54 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.13 2010/10/17 15:33:04 phx Exp $
+$NetBSD: version,v 1.14 2018/11/16 14:58:54 tsutsui Exp $
 
 1.1:           Initial revision from NetBSD/powerpc.
 1.2:           Use MI loadfile().
@@ -14,3 +14,4 @@
 1.11:          Check floppyboot and disable LOAD_NOTE to avoid backward seek.
 1.12:          Read Apple Partition Map to find the root partition, when
                no OF path was specified.
+1.13:          Fix boot failure of installation floppies