summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorjw149990 <none@none>2007-12-05 19:25:51 -0800
committerjw149990 <none@none>2007-12-05 19:25:51 -0800
commit664a673477ba7d1a08fe6e9fd8076e744913d25c (patch)
treee04c933a42540a7018cd4cdcf53cc9202c6a0c90 /usr/src
parentf795e658eba16212cb63cbb1d726a075628e3a4c (diff)
downloadillumos-joyent-664a673477ba7d1a08fe6e9fd8076e744913d25c.tar.gz
6637615 mpt driver mis-remove the entry from driver_classes
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/pkgdefs/common_files/i.kclasses_i3865
-rw-r--r--usr/src/pkgdefs/common_files/i.kclasses_sparc5
-rw-r--r--usr/src/uts/intel/os/driver_classes1
-rw-r--r--usr/src/uts/sparc/os/driver_classes1
4 files changed, 10 insertions, 2 deletions
diff --git a/usr/src/pkgdefs/common_files/i.kclasses_i386 b/usr/src/pkgdefs/common_files/i.kclasses_i386
index 096a5552fa..ddbd428c3b 100644
--- a/usr/src/pkgdefs/common_files/i.kclasses_i386
+++ b/usr/src/pkgdefs/common_files/i.kclasses_i386
@@ -65,7 +65,6 @@ do
-e '/^smartii[ ].*dada/d' \
-e '/^trantor[ ].*scsi/d' \
-e '/^corvette[ ].*scsi/d' \
- -e '/^mpt[ ].*scsi/d' \
-e '/^pci_to_i2o[ ].*i2o/d' \
-e '/^i2o_scsi[ ].*scsi/d' \
$dest > /tmp/c.$$
@@ -91,6 +90,10 @@ do
if [ $? != 0 ] ; then
echo 'mscsi scsi' >> $dest
fi
+ grep '^mpt[ ].*scsi' $dest > /dev/null 2>&1
+ if [ $? != 0 ] ; then
+ echo 'mpt scsi' >> $dest
+ fi
fi
done
diff --git a/usr/src/pkgdefs/common_files/i.kclasses_sparc b/usr/src/pkgdefs/common_files/i.kclasses_sparc
index 2702f4c26b..787a2cc8e7 100644
--- a/usr/src/pkgdefs/common_files/i.kclasses_sparc
+++ b/usr/src/pkgdefs/common_files/i.kclasses_sparc
@@ -53,7 +53,6 @@ do
-e '/^ncr[ ]*scsi$/d' \
-e '/^vme[ ]*vme$/d' \
-e '/^pci[ ]*pci$/d' \
- -e '/^mpt[ ]*scsi$/d' \
$dest > /tmp/rest.$$ 2>/dev/null
cat /tmp/newident.$$ /tmp/rest.$$ > $dest
grep '^isp scsi' $dest > /dev/null 2>&1
@@ -96,6 +95,10 @@ do
if [ $? != 0 ] ; then
echo 'simba pci' >> $dest
fi
+ grep '^mpt[ ].*scsi' $dest > /dev/null 2>&1
+ if [ $? != 0 ] ; then
+ echo 'mpt scsi' >> $dest
+ fi
fi
done
rm -f /tmp/newident.$$ /tmp/rest.$$
diff --git a/usr/src/uts/intel/os/driver_classes b/usr/src/uts/intel/os/driver_classes
index 90ad0e4f92..8b2115730b 100644
--- a/usr/src/uts/intel/os/driver_classes
+++ b/usr/src/uts/intel/os/driver_classes
@@ -29,3 +29,4 @@ isa sysbus
eisa sysbus
pci pci
pci_pci pci
+mpt scsi
diff --git a/usr/src/uts/sparc/os/driver_classes b/usr/src/uts/sparc/os/driver_classes
index 89ad60c3cc..5e8ebecad6 100644
--- a/usr/src/uts/sparc/os/driver_classes
+++ b/usr/src/uts/sparc/os/driver_classes
@@ -35,3 +35,4 @@ ebus ebus
glm scsi
uata dada
uata scsi
+mpt scsi