From fd8d95354518f6dcd4eb85ee2f2c709b0459fa1d Mon Sep 17 00:00:00 2001 From: KATO Takenori Date: Fri, 13 Aug 1999 02:05:07 +0000 Subject: [PATCH] Merge from sys/boot/i386/libi386/bootinfo.c revision 1.21. --- sys/boot/pc98/libpc98/bootinfo.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/boot/pc98/libpc98/bootinfo.c b/sys/boot/pc98/libpc98/bootinfo.c index 0909d9b9c55..92bb219b0ba 100644 --- a/sys/boot/pc98/libpc98/bootinfo.c +++ b/sys/boot/pc98/libpc98/bootinfo.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bootinfo.c,v 1.3 1999/03/19 15:58:05 kato Exp $ + * $Id: bootinfo.c,v 1.4 1999/06/06 12:46:40 kato Exp $ */ #include @@ -264,6 +264,10 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) return(EINVAL); } + /* Try reading the /etc/fstab file to select the root device */ + getrootmount(i386_fmtdev((void *)rootdev)); + + /* Do legacy rootdev guessing */ switch(rootdev->d_type) { case DEVT_DISK: /* pass in the BIOS device number of the current disk */ @@ -275,7 +279,7 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) return(EINVAL); default: - printf("aout_exec: WARNING - don't know how to boot from device type %d\n", rootdev->d_type); + printf("WARNING - don't know how to boot from device type %d\n", rootdev->d_type); } free(rootdev); *bootdevp = bootdevnr;