summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1999-08-13 02:05:07 +0000
committerkato <kato@FreeBSD.org>1999-08-13 02:05:07 +0000
commit5d961b3389b2433f5e70de301fda76ae8c915f2d (patch)
tree9ffceeb145002908261f51e4578c7035b25bfec2 /sys/boot
parent8aeb444e35dfe2166b7700934ee1ef382c24e567 (diff)
downloadFreeBSD-src-5d961b3389b2433f5e70de301fda76ae8c915f2d.zip
FreeBSD-src-5d961b3389b2433f5e70de301fda76ae8c915f2d.tar.gz
Merge from sys/boot/i386/libi386/bootinfo.c revision 1.21.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/pc98/libpc98/bootinfo.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/boot/pc98/libpc98/bootinfo.c b/sys/boot/pc98/libpc98/bootinfo.c
index 0909d9b..92bb219 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 <stand.h>
@@ -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;
OpenPOWER on IntegriCloud