split up the long lines in audo_add_modules

add a bunch of needed modules

2 files changed, 45 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index e2a24de..b83cd21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,33 @@
 initramfs-tools (0.54) unstable; urgency=low
 
-  * hooks/lvm: lvm10 has also an vgchange -  exit if no lvm2 libs.
+  * hooks/lvm: lvm10 has also an vgchange - exit if no lvm2 libs.
     (closes: #354708)
 
   * debian/copyright: Meniton current bzr archive. (closes: #352738)
 
-  * hook-function: Add dac960 scsi driver for alpha arch. (closes: #355162)
+  * hook-function: Add dac960 scsi driver. (closes: #355162)
 
-  * scripts/local-top/udev-helper: moved from
-    scripts/init-premount/udev-helper, add code by Scott James Remnant
+  * scripts/local-top/udev_helper: moved from
+    scripts/init-premount/udev_helper, add code by Scott James Remnant
     <scott@ubuntu.com> from the ubuntu udev hook. We now wait on scsi
     and usb devices to settle, load ide-generic on ide boot only if
     no root device appeared.
     The udev hook is adding ide.agent so no longer duplicate that code.
 
- -- maximilian attems <maks@sternwelten.at>  Sat,  4 Mar 2006 00:14:00 +0100
+  * hook-function: auto_add_modules, split 1000 char wide lines up.
+    Should allow better diffing. Splitting them out in proper files with
+    each modules / line costs too much initramfs generation time.
+    Should allow easier diffing.
+
+  * modules.d/scsi: Add sata_mv thanks Kenshi Muto <kmuto@debian.org>.
+    (closes: #355486)
+
+  * hook-function: Add dasd class to auto_add_modules and dd zfcp module.
+    Thanks to s390 support Bastian Blank <waldi@debian.org>. (closes: #355595)
+
+  * modules.d/ide: Add it821x. (closes #352460)
+
+ -- maximilian attems <maks@sternwelten.at>  Tue,  7 Mar 2006 00:49:46 +0100
 
 initramfs-tools (0.53) unstable; urgency=high
 
diff --git a/hook-functions b/hook-functions
index bdb657a..90986cb 100644
--- a/hook-functions
+++ b/hook-functions
@@ -133,35 +133,50 @@ dep_add_modules()
 }
 
 
-# Modules that we always add to the initramfs
+# The modules "most" classes added per default to the initramfs
 auto_add_modules()
 {
 	case "$1" in
 	base)
-		for x in ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 ext3 isofs jfs nfs reiserfs xfs af_packet atkbd i8042; do
+		for x in ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 \
+		ext3 isofs jfs nfs reiserfs xfs af_packet atkbd i8042; do
 			manual_add_modules "${x}"
 		done
 	;;
 	net)
-		for x in 3c59x 8139cp 8139too 8390 b44 bmac bnx2 defxx dl2k e1000 e100 epic100 eql fealnx famachi forcedeth hp100 mace mv643xx_eth natsemi ne2k-pci netconsole ns83820 pcnet32 r8169 s2io sis900 skge slhc starfire sundance sungem sungem_phy sunhme tg3 tlan de2104x de4x5 dmfe tulip winbond-840 xircom_cb xircom_tulip_cb typhon via-rhine via-velocity yellowfin; do
+		for x in 3c59x 8139cp 8139too 8390 b44 bmac bnx2 defxx \
+		dl2k e1000 e100 epic100 eql fealnx famachi forcedeth \
+		hp100 mace mv643xx_eth natsemi ne2k-pci netconsole \
+		ns83820 pcnet32 r8169 s2io sis900 skge slhc starfire \
+		sundance sungem sungem_phy sunhme tg3 tlan de2104x \
+		de4x5 dmfe tulip winbond-840 xircom_cb xircom_tulip_cb \
+		typhon via-rhine via-velocity yellowfin; do
 			manual_add_modules "${x}"
 		done
 	;;
 	ide)
-		for x in ide-cd ide-disk ide-generic aec62xx alim15x3 amd74xx atiixp atuuxo cmd64x cs5520 cs5530 cy82c693 generic hpt34x hpt366 ns87415 opti621 pdc202xx_new pdc202xx_old piix rz1000 sc1200 serverworks siimage sis5513 slc82c105 slc90e66 triflex trm290 via82cxxx; do
+		for x in ide-cd ide-disk ide-generic aec62xx alim15x3 \
+		amd74xx atiixp atuuxo cmd64x cs5520 cs5530 cy82c693 \
+		generic hpt34x hpt366 it821x ns87415 opti621 pdc202xx_new \
+		pdc202xx_old piix rz1000 sc1200 serverworks siimage \
+		sis5513 slc82c105 slc90e66 triflex trm290 via82cxxx; do
 			manual_add_modules "${x}"
 		done
 	;;
 	scsi)
-		for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic cciss ch dc395x dmx3191d dpt_i2o eata fdomain ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 megaraid megaraid_mbox megaraid_mm mesh mptfc mptscsih mptsas mptspi nsp32 osst qla1280 qla2100 qla2200 qla2300 qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_promise sata_nv sata_qstor sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc scsi_mod scsi_transport_fc scsi_transport_iscsi scsi_transport_spi sd_mod sym53c8xx tmscsim; do
+		for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci \
+		aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic \
+		cciss ch dac960 dc395x dmx3191d dpt_i2o eata fdomain \
+		ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 \
+		megaraid megaraid_mbox megaraid_mm mesh mptfc mptscsih \
+		mptsas mptspi nsp32 osst qla1280 qla2100 qla2200 qla2300 \
+		qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_mv \
+		sata_nv sata_promise sata_qstor sata_sil sata_sis sata_svw \
+		sata_sx4 sata_uli sata_via sata_vsc scsi_mod \
+		scsi_transport_fc scsi_transport_iscsi scsi_transport_spi \
+		sd_mod sym53c8xx tmscsim zfcp; do
 			manual_add_modules "${x}"
 		done
-	case "${DPKG_ARCH}" in
-	alpha)
-		for x in dac960; do
-			manual_add_modules "${x}"
-		done
-	esac
 	;;
 	ieee1394)
 		for x in ohci1394 sbp2; do
@@ -179,6 +194,7 @@ auto_add_modules()
 		auto_add_modules ide
 		auto_add_modules scsi
 		auto_add_modules i2o
+		auto_add_modules dasd
 	;;
 	esac
 }