From 9264d0947e8db34b49661273139bd369760c3207 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 15 Feb 2016 02:39:05 +0000
Subject: [PATCH] udeb: scsi-modules: Include SCSI drivers by default

---
 debian/changelog                      |   1 +
 debian/installer/modules/scsi-modules | 121 ++++++++++----------------
 2 files changed, 45 insertions(+), 77 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4946e4e54..f8763a5bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ linux (4.4.1-1) UNRELEASED; urgency=medium
       drivers by default
     - {pata,sata}-modules: Include ATA drivers by default
     - sound-modules: Include sound drivers by default
+    - scsi-modules: Include SCSI drivers by default
 
   [ Roger Shimizu ]
   * Enable TTY_PRINTK as module (Closes: #814540).
diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules
index 67df41ae2..4a5a3dbc6 100644
--- a/debian/installer/modules/scsi-modules
+++ b/debian/installer/modules/scsi-modules
@@ -1,83 +1,50 @@
-# host adapters
-3w-9xxx ?
-3w-sas ?
-3w-xxxx
-BusLogic ?
+# Include SCSI controller drivers by default
+drivers/scsi/**
 DAC960
-NCR53c406a ?
-aacraid
-advansys ?
-aha152x ?
-aha1542 ?
-aha1740 ?
-aic79xx
-aic7xxx
-aic94xx ?
-arcmsr ?
-atp870u ?
-bnx2fc ?
 cciss
-cpqarray ?
-csiostor ?
-dc395x ?
-dmx3191d
-dtc ?
-eata ?
-esas2r ?
-fd_mcs ?
-fdomain ?
-fnic ?
-g_NCR5380 ?
-gdth ?
-hpsa ?
-hptiop ?
-ibmmca ?
-in2000 ?
-initio ?
-ipr ?
-ips
-isci ?
+mptfc
+mptsas
+mptspi
+
+# Include iSCSI boot support
 iscsi_ibft ?
-iscsi_tcp ?
-lpfc ?
-megaraid ?
-megaraid_mbox ?
-megaraid_mm ?
-megaraid_sas ?
-mpt3sas ?
-mptbase
-mptfc ?
-mptsas ?
-mptscsih
-mptspi ?
-mvsas
-pas16 ?
-pm80xx ?
-pmcraid ?
-qla1280 ?
-qla2xxx ?
-qla4xxx ?
-qlogicfas ?
-qlogicfas408 ?
-sim710 ?
-snic ?
-stex ?
-sym53c416 ?
-sym53c8xx
-sym53c8xx_2 ?
-t128 ?
-u14-34f ?
-ufshcd ?
-ufshcd-pci ?
-ultrastor ?
-vmw_pvscsi ?
-wd7000 ?
-wd719x ?
+
+# Include Xen block driver even though it's not SCSI
 xen-blkfront ?
 
-# generic
-sg
+# Exclude hv_storvsc, packaged in hyperv-modules
+hv_storvsc -
 
-# tape
-osst
-st
+# Exclude virtio_scsi, packaged in virtio-modules
+virtio_scsi -
+
+# Exclude PCMCIA drivers, which depend on pcmcia-modules (FIXME)
+drivers/scsi/pcmcia/* -
+
+# Exclude Chelsio iSCSI drivers, which depend on the corresponding Ethernet
+# drivers in nic-modules (FIXME)
+drivers/scsi/cxgbi/* -
+cxgb3i -
+cxgb4i -
+
+# Exclude enclosure driver
+ses -
+
+# Exclude target drivers
+tcm_qla2xxx -
+
+# Exclude common code packaged in {cdrom,scsi}-core-modules
+scsi_mod -
+sd_mod -
+sr_mod -
+scsi_transport_sas -
+scsi_transport_spi -
+
+# Exclude any other common code that isn't pulled in by dependencies
+drivers/scsi/device_handler/* -
+drivers/scsi/lib** -
+drivers/scsi/osd/* -
+drivers/scsi/scsi_transport_* -
+fcoe -
+raid_class -
+scsi_debug -