Remove detect_sbp2_devices() for gentoo bug #255558

diff --git a/ChangeLog b/ChangeLog
index 420828b3d12a8cd2e5db8ccf93df597e79723fc1..1a39e6b1d3697ae23b136949988f5f2b5d16e780 100644 (file)
--- 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 #255558
+
   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 beec6de2ed5d4355b1ce6783bf6c7ce2b01464c5..a280687b7bb539a204196c3f96af4d95da620ffb 100755 (executable)
--- 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 d506f838f8d76af0718345ec56330924e14e466e..cade3e0e3b5508945b846c371bf905fd8589f51d 100755 (executable)
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -222,7 +222,6 @@ fi
 
 splash 'init'
 
-detect_sbp2_devices
 cmdline_hwopts
 
 # Mount sysfs