From d48dc40bd29a8fcf2348662845f7860e15c4e666 Mon Sep 17 00:00:00 2001
From: Andrew Gaffney <agaffney@gentoo.org>
Date: Mon, 19 Jan 2009 15:45:03 -0600
Subject: [PATCH] Remove detect_sbp2_devices() for gentoo bug #239474

---
 ChangeLog               |  4 ++++
 defaults/initrd.scripts | 24 ------------------------
 defaults/linuxrc        |  1 -
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 420828b..8446d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  19 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc:
+  Remove detect_sbp2_devices() for gentoo bug #239474
+
   16 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> genkernel.conf:
   Add commented out DISKLABEL=yes option for gentoo bug #229847
 
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index beec6de..a280687 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -459,30 +459,6 @@ load_modules() {
 	fi
 }
 
-detect_sbp2_devices() {
-	# http://www.linux1394.org/sbp2.php
-	
-	# /proc
-	# /proc/scsi/sbp2/0, /proc/scsi/sbp2/1, etc.
-	#
-	# You may manually add/remove SBP-2 devices via the procfs with:
-	# add-single-device <h> <b> <t> <l> or remove-single-device <h> <b> <t> <l>,
-	# where:
-	#
-	# <h> = host (starting at zero for first SCSI adapter)
-	# <b> = bus (normally zero)
-	# <t> = target (starting at zero for first SBP-2 device)
-	# <l> - lun (normally zero) 
-	# e.g. To manually add/detect a new SBP-2 device
-	# echo "scsi add-single-device 0 0 0 0" > /proc/scsi/scsi
-	# e.g. To manually remove a SBP-2 device after it's been unplugged
-	# echo "scsi remove-single-device 0 0 0 0" > /proc/scsi/scsi
-	# e.g. To check to see which SBP-2/SCSI devices are currently registered
-	# cat /proc/scsi/scsi 
-
-	[ -e /proc/scsi/scsi ] && echo 'scsi add-single-device 0 0 0 0' > /proc/scsi/scsi
-}
-
 setup_keymap() {
 	if [ "${DO_keymap}" ]
 	then
diff --git a/defaults/linuxrc b/defaults/linuxrc
index d506f83..cade3e0 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -222,7 +222,6 @@ fi
 
 splash 'init'
 
-detect_sbp2_devices
 cmdline_hwopts
 
 # Mount sysfs
-- 
2.26.2