Adjust for sd->da and the loss of od.

5 files changed, 25 insertions, 29 deletions

diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index a8a7384..1b4cfe1 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.63 1998/03/07 10:48:07 eivind Exp $
+#	$Id: Makefile,v 1.64 1998/05/27 12:13:18 jkoshy Exp $
 #
 
 PROG=	boot
@@ -37,17 +37,13 @@ CFLAGS+=	-DCONSPEED=${BOOT_COMCONSOLE_SPEED}
 # Details: this only applies if BOOT_HD_BIAS > 0.  If the BIOS drive number
 # for the boot drive is >= BOOT_HD_BIAS, then the boot drive is assumed to
 # be SCSI and have unit number (BIOS_drive_number - BOOT_HD_BIAS).  E.g.,
-# BOOT_HD_BIAS=1 makes BIOS drive 1 correspond to 1:sd(0,a) instead of
-# 1:wd(1,a).  If `sd' is given explicitly, then the drive is assumed to be
-# SCSI and have BIOS drive number (sd_unit_number + BOOT_HD_BIAS).  E.g.,
-# BOOT_HD_BIAS=1 makes sd(0,a) correspond to 1:sd(0,a) instead of 0:sd(0,a).
+# BOOT_HD_BIAS=1 makes BIOS drive 1 correspond to 1:da(0,a) instead of
+# 1:wd(1,a).  If `da' is given explicitly, then the drive is assumed to be
+# SCSI and have BIOS drive number (da_unit_number + BOOT_HD_BIAS).  E.g.,
+# BOOT_HD_BIAS=1 makes da(0,a) correspond to 1:da(0,a) instead of 0:da(0,a).
 
 CLEANFILES+=	boot.nohdr boot.strip boot1 boot2 sizetest
 LDFLAGS+=	-N -T 0 -nostdlib
-#LINKS=		${BINDIR}/sdboot ${BINDIR}/wdboot\
-#		${BINDIR}/sdboot ${BINDIR}/fdboot\
-#		${BINDIR}/bootsd ${BINDIR}/bootwd\
-#		${BINDIR}/bootsd ${BINDIR}/bootfd
 NOSHARED=	YES
 NOMAN=
 STRIP=
@@ -91,7 +87,7 @@ install:
 		boot1 ${DESTDIR}${BINDIR}/boot1
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
 		boot2 ${DESTDIR}${BINDIR}/boot2
-	for i in sd fd wd od vn wfd ; do \
+	for i in da fd wd od vn wfd ; do \
 		( cd ${DESTDIR}${BINDIR} ; \
 		rm -f boot$${i} $${i}boot ; \
 		ln -s boot1 $${i}boot ; \
diff --git a/sys/i386/boot/biosboot/README.386BSD b/sys/i386/boot/biosboot/README.386BSD
index 2849238..345c953 100644
--- a/sys/i386/boot/biosboot/README.386BSD
+++ b/sys/i386/boot/biosboot/README.386BSD
@@ -26,7 +26,7 @@ menu for switching between operating systems.
 3/ The MBR will load the first record of the selected partition and
 if it has (the same) magic numbers, jumps into it. In 386bsd this is the
 first stage boot, (or boot1) it is represented in /usr/mdec by
-wdboot, asboot and sdboot. If the disk has been set up without DOS partitioning
+wdboot, asboot and daboot. If the disk has been set up without DOS partitioning
 then this block will be at block zero, and will have been loaded directly by
 the BIOS. This is the usual case with floppies.
 
@@ -129,21 +129,21 @@ will boot xxx from drive 0, a partition.
 	wd(1,a)xxx
 will boot xxx from drive 1, a partition.
 
-similarly for sd and for higher drive numbers (if the BIOS supports them).
+similarly for da and for higher drive numbers (if the BIOS supports them).
 
 if you have one or more wd drives and one or more scsi drives, then you
 MUST specify the BIOS drive number for booting the scsi drives:
-	2:sd(0,a)xxx
+	2:da(0,a)xxx
 will boot xxx from scsi drive 0, a partition, provided `2' is the correct
-BIOS drive number for sd0.
+BIOS drive number for da0.
 
 otherwise the following will happen:
 
-with wd0 and sd0, you specify sd1 or wd1 to indicate the 2nd drive.
-it boots the kernel correctly, then tells the kernel to use sd1 as root.
-you however may not have an sd1, and problems arise.
+with wd0 and da0, you specify da1 or wd1 to indicate the 2nd drive.
+it boots the kernel correctly, then tells the kernel to use da1 as root.
+you however may not have an da1, and problems arise.
 
-Whether sd or wd is specified to the kernel is read from the disklabel,
+Whether da or wd is specified to the kernel is read from the disklabel,
 so ensure that all SCSI disks have type SCSI in their disklabel or the
 boot code will assume they are ESDI or IDE. (Remember, because it is
 working through the BIOS it has ho idea what kind of disk it is.
@@ -151,13 +151,13 @@ working through the BIOS it has ho idea what kind of disk it is.
 ##########################################################################
 Installing:
 The makefile supplied has a target install which will create the
-files wdboot,bootwd ,sdboot and bootsd in /usr/mdec.
+files wdboot,bootwd ,daboot and bootda in /usr/mdec.
 BEWARE these will overwrite the existing wdboot and bootwd. (so back
 them up)
 
-there are also targets wd and sd which wil only do one of them
+there are also targets wd and da which wil only do one of them
 
-The commented out targets wd0 and sd0 are examples of how to 
+The commented out targets wd0 and da0 are examples of how to 
 load the new bootblocks, however,make sure you change the 
 device type and label to suit your drive if you uncomment them.
 (see 'man disklabel')
@@ -169,4 +169,4 @@ Before you do this ensure you have a booting floppy with correct
 disktab and bootblock files on it so that if it doesn't work, you can
 re-disklabel from the floppy.
 
-$Id$
+$Id: README.386BSD,v 1.9 1997/02/22 09:30:02 peter Exp $
diff --git a/sys/i386/boot/biosboot/README.MACH b/sys/i386/boot/biosboot/README.MACH
index cb62329..5f8b79d 100644
--- a/sys/i386/boot/biosboot/README.MACH
+++ b/sys/i386/boot/biosboot/README.MACH
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:33:55  rpd
- *	$Id$
+ *	$Id: README.MACH,v 1.5 1997/02/22 09:30:03 peter Exp $
  */
 
 ********NOTE: This is not all relevant to the 386BSD version**********
@@ -206,5 +206,5 @@ for 1MB and the bootblocks modified to run below 512KB. (8000:0)]
 
 	make -f boot.mk fdboot      (floppy boot loader)
 	make -f boot.mk hdboot      (wini boot loader)
-[to make 386bsd bootblocks  "make sd wd" (warning: they will be installed
+[to make 386bsd bootblocks  "make da wd" (warning: they will be installed
 in /dev/mdec.. take backups)]
diff --git a/sys/i386/boot/biosboot/boot.help b/sys/i386/boot/biosboot/boot.help
index 7cbce13..396fd94 100644
--- a/sys/i386/boot/biosboot/boot.help
+++ b/sys/i386/boot/biosboot/boot.help
@@ -1,6 +1,6 @@
 Usage: bios_drive:interface(unit,partition)kernel_name options
     bios_drive   0, 1, ...
-    interface    fd, wd or sd
+    interface    fd, wd or da
     unit         0, 1, ...
     partition    a, c, ...
     kernel_name  name of kernel, or ? for list of files in root directory
@@ -8,10 +8,10 @@ Usage: bios_drive:interface(unit,partition)kernel_name options
                  -d (debug early) -g (gdb) -h (serial console) -P (probe kbd)
                  -r (default root) -s (single user) -v (verbose)
 Examples:
-    1:sd(0,a)mykernel  boot `mykernel' on the first SCSI drive when one IDE
+    1:da(0,a)mykernel  boot `mykernel' on the first SCSI drive when one IDE
                        drive is present
     1:wd(2,a)          boot from the second (secondary master) IDE drive
-    1:sd(0,a)?         list the files in the root directory on the specified
+    1:da(0,a)?         list the files in the root directory on the specified
                        drive/unit/partition, and set the default bios_drive,
                        interface, unit and partition
     -cv                boot with the defaults, then run UserConfig to modify
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index ae0a2f0..b13b7f0 100644
--- a/sys/i386/boot/biosboot/table.c
+++ b/sys/i386/boot/biosboot/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id$
+ *	$Id: table.c,v 1.15 1997/02/22 09:30:15 peter Exp $
  */
 
 /*
@@ -136,5 +136,5 @@ struct pseudo_desc Idtr_real = { 0x400 - 1, 0x0, 0x0 };
  * All initialized data is defined in one file to reduce space wastage from
  * fragmentation.
  */
-char *devs[] = { "wd", "dk", "fd", "wt", "sd", 0 };
+char *devs[] = { "wd", "dk", "fd", "wt", "da", 0 };
 unsigned long tw_chars = 0x5C2D2F7C;	/* "\-/|" */