From db283fd6d5265fbbe4ec951bc2a5297e48eb6dec Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Fri, 4 Jan 2002 07:59:27 +0000 Subject: [PATCH] Don't turn on RB_CDROM if the rootdev is a BIOS cd device for now as this breaks when cdboot is used with an MFS root. --- sys/boot/i386/libi386/bootinfo.c | 2 -- sys/boot/i386/libi386/bootinfo32.c | 2 -- sys/boot/i386/libi386/bootinfo64.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c index 1c6b1d23e22..448bb5b059f 100644 --- a/sys/boot/i386/libi386/bootinfo.c +++ b/sys/boot/i386/libi386/bootinfo.c @@ -284,8 +284,6 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) /* Pass in BIOS device number. */ bi.bi_bios_dev = bc_unit2bios(rootdev->d_kind.bioscd.unit); bootdevnr = bc_getdev(rootdev); - if (bootdevnr != -1) - *howtop |= RB_CDROM; break; case DEVT_DISK: diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c index 1c6b1d23e22..448bb5b059f 100644 --- a/sys/boot/i386/libi386/bootinfo32.c +++ b/sys/boot/i386/libi386/bootinfo32.c @@ -284,8 +284,6 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) /* Pass in BIOS device number. */ bi.bi_bios_dev = bc_unit2bios(rootdev->d_kind.bioscd.unit); bootdevnr = bc_getdev(rootdev); - if (bootdevnr != -1) - *howtop |= RB_CDROM; break; case DEVT_DISK: diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c index 1c6b1d23e22..448bb5b059f 100644 --- a/sys/boot/i386/libi386/bootinfo64.c +++ b/sys/boot/i386/libi386/bootinfo64.c @@ -284,8 +284,6 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) /* Pass in BIOS device number. */ bi.bi_bios_dev = bc_unit2bios(rootdev->d_kind.bioscd.unit); bootdevnr = bc_getdev(rootdev); - if (bootdevnr != -1) - *howtop |= RB_CDROM; break; case DEVT_DISK: