Re: Strange boot problems on amd64-current (6.99.40)

[christos%zoulas.com@localhost (Christos Zoulas)]

On May 11,  7:48pm, paul%whooppee.com@localhost (Paul Goyette) wrote:
-- Subject: Re: Strange boot problems on amd64-current (6.99.40)

This should work... But it is sub-optimal.

christos

Index: rf_netbsdkintf.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_netbsdkintf.c,v
retrieving revision 1.309
diff -u -u -r1.309 rf_netbsdkintf.c
--- rf_netbsdkintf.c    8 May 2014 20:36:15 -0000       1.309
+++ rf_netbsdkintf.c    12 May 2014 02:53:07 -0000
@@ -539,8 +539,10 @@
                        candidate_root = rsc->sc_dev;
                if (booted_device == NULL ||
                    rsc->sc_r.root_partition == 1 ||
-                   rf_containsboot(&rsc->sc_r, booted_device))
+                   rf_containsboot(&rsc->sc_r, booted_device)) {
                        booted_device = candidate_root;
+                       booted_partition = 0;   /* XXX assume 'a' */
+               }
        } else if (num_root > 1) {
 
                /* 
@@ -571,6 +573,7 @@
 
                if (num_root == 1) {
                        booted_device = rsc->sc_dev;
+                       booted_partition = 0;   /* XXX assume 'a' */
                } else {
                        /* we can't guess.. require the user to answer... */
                        boothowto |= RB_ASKNAME;