Stop providing a bsd.scsi3 kernel on sparc. If you have a system with multiple

disks and scsi id#3 as the boot device, by all means, use DUIDs to mount your
filesystems and it won't matter what sd unit number the boot disk attaches with.

4 files changed, 19 insertions, 37 deletions

diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 821c313d99d..5b686c537d4 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.64 2011/04/10 13:47:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.65 2011/06/15 21:36:48 miod Exp $
 TopPart
 
 OpenBSDminiroot
@@ -12,9 +12,6 @@ OpenBSDdistsets
 
 OpenBSDbsd
 
-	bsd.scsi3	A kernel with SCSI target 3 re-mapped as 0 and 0
-			re-mapped as 3.
-
 OpenBSDrd
 
 OpenBSDinstalliso
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index e1dd6182483..106954d6179 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.73 2011/03/09 17:11:40 ian Exp $
+dnl	$OpenBSD: install,v 1.74 2011/06/15 21:36:48 miod Exp $
 OpenBSDInstallPrelude({:-SMD disks-:})
 
 There are several ways to install OpenBSD onto a disk.  The normal way
@@ -289,15 +289,15 @@ The installboot man page says to do something like this:
 You can now extract the provided "*.tgz" files onto your disk.
 
     sunos# ls -FC
-    base{:--:}OSrev.tgz      comp{:--:}OSrev.tgz   man{:--:}OSrev.tgz       xserv{:--:}OSrev.tgz
-    bsd             etc{:--:}OSrev.tgz    xbase{:--:}OSrev.tgz
-    bsd.scsi3       game{:--:}OSrev.tgz   xfont{:--:}OSrev.tgz
+    base{:--:}OSrev.tgz      comp{:--:}OSrev.tgz      man{:--:}OSrev.tgz       xfont{:--:}OSrev.tgz
+    bsd             etc{:--:}OSrev.tgz       xbase{:--:}OSrev.tgz     xserv{:--:}OSrev.tgz
+    bsd.rd          game{:--:}OSrev.tgz      xetc{:--:}OSrev.tgz      xshare{:--:}OSrev.tgz
     sunos{:-#-:} gunzip < base{:--:}OSrev.tgz | (cd /mnt; gtar xvpf -)
     [...] for each set
 
-And finally copy an OpenBSD kernel (either bsd or bsd.scsi3) onto your disk.
+And finally copy the OpenBSD kernel onto your disk.
 
-    sunos# cp bsd.scsi3 /mnt/bsd
+    sunos# cp bsd /mnt/bsd
 
 The GNU gunzip and gtar programs are not distributed as part of SunOS,
 but may be present in your /usr/local/bin.  If not, you will need to
@@ -382,15 +382,15 @@ The installboot man page says to do something like this:
 You can now extract the provided "*.tgz" files onto your disk.
 
     solaris# ls -FC
-    base{:--:}OSrev.tgz      comp{:--:}OSrev.tgz   man{:--:}OSrev.tgz       xserv{:--:}OSrev.tgz
-    bsd             etc{:--:}OSrev.tgz    xbase{:--:}OSrev.tgz
-    bsd.scsi3       game{:--:}OSrev.tgz   xfont{:--:}OSrev.tgz
+    base{:--:}OSrev.tgz      comp{:--:}OSrev.tgz      man{:--:}OSrev.tgz       xfont{:--:}OSrev.tgz
+    bsd             etc{:--:}OSrev.tgz       xbase{:--:}OSrev.tgz     xserv{:--:}OSrev.tgz
+    bsd.rd          game{:--:}OSrev.tgz      xetc{:--:}OSrev.tgz      xshare{:--:}OSrev.tgz
     solaris{:-#-:} gunzip < base{:--:}OSrev.tgz | (cd /mnt; tar xvpf -)
     [...] for each set
 
-And finally copy an OpenBSD kernel (either bsd or bsd.scsi3) onto your disk.
+And finally copy the OpenBSD kernel onto your disk.
 
-    solaris# cp bsd.scsi3 /mnt/bsd
+    solaris# cp bsd /mnt/bsd
 
 The GNU gunzip program is not distributed as part of Solaris, but may be
 present in your /usr/local/bin.  If not, you will need to obtain it from a
diff --git a/distrib/notes/sparc/prep b/distrib/notes/sparc/prep
index db0b5295553..8d76a071c91 100644
--- a/distrib/notes/sparc/prep
+++ b/distrib/notes/sparc/prep
@@ -18,18 +18,12 @@ Unlike SunOS and the OpenBOOT ROM, a generic OpenBSD kernel numbers
 SCSI drives sequentially as it finds them.  The drive with the
 lowest SCSI-ID will be called sd0, the next one sd1, etc.
 
-To ease the installation process, two OpenBSD kernels are provided in
-the installation sets.  The default OpenBSD kernel (bsd) is set up
-to use the OpenBSD mapping, while a special kernel (bsd.scsi3) is
-set up to match the Sun mapping above by hard-wiring SCSI-ID#3 to sd0
-and SCSI-ID#0 to sd3. The remaining drives will be dynamically mapped
-to other sd* numbers.
-
 This is mostly a non-issue if you have only one drive on your system,
-but can get confusing if you have multiple drives.  If you plan
-to eliminate SunOS altogether it may be best to correct the SCSI-IDs
-of your drives, while if you plan to leave SunOS installed, it may
-be better to install OpenBSD on a drive with SCSI-ID 1 or 0.
+but can get confusing if you have multiple drives (unless you choose
+to use DUIDs to access partitions).  If you plan to eliminate SunOS
+altogether it may be best to correct the SCSI-IDs of your drives,
+while if you plan to leave SunOS installed, it may be better to
+install OpenBSD on a drive with SCSI-ID 1 or 0.
 
 Older OpenBoot proms (versions 1.x) provide an environment variable,
 sd-targets, that controls the drive<->SCSI-ID mapping; you can change
@@ -40,11 +34,6 @@ To revert to the ``normal'' behaviour, enter the following command:
 
     ok setenv sd-targets 01234567
 
-NOTE: if you elect to build a custom kernel you may want to "hardwire"
-the SCSI-IDs to sd0->SCSI-ID 0 or your desired scheme, this helps
-prevent accidents if you change the SCSI bus configuration or a drive
-is down.
-
 Your OpenBOOT ROM may need some setup.  If you are running OpenBSD on
 a sun4c, sun4e or sun4m system, the ROM must be set to "new" command
 mode.  If your machine comes up and gives you a `>' prompt instead of
diff --git a/etc/etc.sparc/Makefile.inc b/etc/etc.sparc/Makefile.inc
index 8c03ae4238e..a88fc0644d3 100644
--- a/etc/etc.sparc/Makefile.inc
+++ b/etc/etc.sparc/Makefile.inc
@@ -1,12 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.19 2011/04/15 03:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.20 2011/06/15 21:36:50 miod Exp $
 
 kernels: bsd bootblocks
 	cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \
 	    ${RELEASEDIR}/bsd
-	s=`printf "find sd\nexit" | config -e ${RELEASEDIR}/bsd | \
-	    grep scsibus | awk '{print $$1}'`; \
-	    printf "add sd0\n%s\n%s\nchange %s\ny\n3\n\n\nquit\n" $$s $$s $$s | \
-	    config -e -o ${RELEASEDIR}/bsd.scsi3 ${RELEASEDIR}/bsd
 
 bsd:
 	cd ${.CURDIR}/../sys/arch/sparc/conf && config GENERIC
@@ -18,7 +14,7 @@ bootblocks:
 	${DESTDIR}/usr/mdec/binstall net /tmp && \
 	    mv /tmp/boot.sparc.openbsd ${RELEASEDIR}/boot.net
 
-MDEXT=	bsd bsd.rd bsd.scsi3 cd${OSrev}.iso \
+MDEXT=	bsd bsd.rd cd${OSrev}.iso \
 	floppy${OSrev}.fs miniroot${OSrev}.fs \
 	boot boot.net bootxx installboot