From d662898c30f9459c24aa446deb8fe910910f6273 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Mon, 31 Oct 2016 16:18:17 -0500
Subject: [PATCH] Added default modules and made modification to allow override
 files in /usr/share/mkinitramfs/modules

---
 .../Makefile                                  |   4 +-
 SRC/mkinitramfs-0.3/default-modules           | 456 ++++++++++++++++++
 .../sbin/mkinitramfs                          |  27 +-
 .../usr/share/mkinitramfs/default-modules     | 456 ++++++++++++++++++
 .../usr/share/mkinitramfs/init.in             |   0
 5 files changed, 936 insertions(+), 7 deletions(-)
 rename SRC/{mkinitramfs-0.2 => mkinitramfs-0.3}/Makefile (60%)
 create mode 100644 SRC/mkinitramfs-0.3/default-modules
 rename SRC/{mkinitramfs-0.2 => mkinitramfs-0.3}/sbin/mkinitramfs (88%)
 create mode 100755 SRC/mkinitramfs-0.3/usr/share/mkinitramfs/default-modules
 rename SRC/{mkinitramfs-0.2 => mkinitramfs-0.3}/usr/share/mkinitramfs/init.in (100%)

diff --git a/SRC/mkinitramfs-0.2/Makefile b/SRC/mkinitramfs-0.3/Makefile
similarity index 60%
rename from SRC/mkinitramfs-0.2/Makefile
rename to SRC/mkinitramfs-0.3/Makefile
index 02c9aa0..a0e6f26 100644
--- a/SRC/mkinitramfs-0.2/Makefile
+++ b/SRC/mkinitramfs-0.3/Makefile
@@ -1,9 +1,11 @@
 dirs:
 	install -d -m 755 $(DESTDIR)/sbin
-	install -d -m 755 $(DESTDIR)/usr/share/mkinitramfs
+	install -d -m 755 $(DESTDIR)/usr/share/mkinitramfs/modules
 
 files:
 	install -m 755 sbin/mkinitramfs $(DESTDIR)/sbin/mkinitramfs
+	install -m 755 default-modules \
+		$(DESTDIR)/usr/share/mkinitramfs/default-modules
 	install -m 755 usr/share/mkinitramfs/init.in \
 		$(DESTDIR)/usr/share/mkinitramfs/init.in
 
diff --git a/SRC/mkinitramfs-0.3/default-modules b/SRC/mkinitramfs-0.3/default-modules
new file mode 100644
index 0000000..2f595a4
--- /dev/null
+++ b/SRC/mkinitramfs-0.3/default-modules
@@ -0,0 +1,456 @@
+3c574_cs
+3c589_cs
+3c59x
+3w-9xxx
+3w-sas
+3w-xxxx
+8139cp
+8139too
+8390
+a100u2w
+aacraid
+acard-ahci
+acenic
+advansys
+aha152x_cs
+ahci
+aic79xx
+aic7xxx
+aic7xxx_old
+aic94xx
+alx
+amd8111e
+aoe
+arcmsr
+ata_generic
+ata_piix
+aten
+atl1
+atl1c
+atl1e
+atl2
+atp
+atp870u
+auth_rpcgss
+axnet_cs
+b44
+be2iscsi
+be2net
+bfa
+bna
+bnx2
+bnx2fc
+bnx2i
+bnx2x
+bpck
+brd
+broadcom
+bsd_comp
+btrfs
+BusLogic
+cassini
+cb710
+cb710-mmc
+cciss
+cdrom
+ch
+cicada
+cnic
+comm
+configfs
+cpqarray
+crc16
+crc32c
+crc7
+crc-ccitt
+crc-itu-t
+crc-t10dif
+cxgb
+cxgb3
+cxgb3i
+cxgb4
+cxgb4i
+cxgb4vf
+DAC960
+davicom
+dc395x
+dca
+de2104x
+de600
+de620
+defxx
+dl2k
+dmfe
+dm-log
+dm-mirror
+dm-mod
+dm-region-hash
+dm-snapshot
+dmx3191d
+dnet
+dpt_i2o
+drbd
+dstr
+dummy
+e100
+e1000
+e1000e
+eata
+ehci-hcd
+enc28j60
+enclosure
+enic
+epat
+epia
+epic100
+eql
+et1011c
+ethoc
+ext2
+ext3
+ext4
+fan
+fcoe
+fdomain
+fdomain_cs
+fealnx
+ff-memless
+firewire-core
+firewire-ohci
+firewire-sbp2
+fit2
+fit3
+floppy
+fmvj18x_cs
+fnic
+forcedeth
+friq
+frpw
+fscache
+fuse
+gdth
+gre
+hamachi
+hid
+hid-apple
+hid-belkin
+hid-cherry
+hid-chicony
+hid-ezkey
+hid-hyperv
+hid-keytouch
+hid-logitech
+hid-logitech-dj
+hid-microsoft
+hid-monterey
+hid-ortek
+hid-primax
+hid-prodikeys
+hid-roccat
+hid-roccat-arvo
+hid-roccat-common
+hid-samsung
+hid-sjoy
+hid-sunplus
+hid-topseed
+hp100
+hpsa
+hptiop
+hv_netvsc
+hv_storvsc
+hv_vmbus
+i2c-algo-bit
+i2c-core
+i2o_block
+i2o_core
+icplus
+ifb
+igb
+igbvf
+imm
+inet_lro
+initio
+ipg
+ipr
+ips
+isci
+iscsi_boot_sysfs
+iscsi_tcp
+isofs
+ixgb
+ixgbe
+ixgbevf
+jbd
+jbd2
+jfs
+jme
+kbic
+ks8842
+ks8851
+ks8851_mll
+ksz884x
+ktti
+libahci
+libata
+libceph
+libcrc32c
+libcxgbi
+libfc
+libfcoe
+libiscsi
+libiscsi_tcp
+libosd
+libphy
+libsas
+libsrp
+lockd
+loop
+lpfc
+lru_cache
+lxt
+macvlan
+macvtap
+marvell
+mbcache
+mdio
+mdio-bitbang
+megaraid
+megaraid_mbox
+megaraid_mm
+megaraid_sas
+micrel
+mii
+mlx4_core
+mlx4_en
+mmc_block
+mmc_core
+mmc_spi
+mpt2sas
+mptbase
+mptfc
+mptsas
+mptscsih
+mptspi
+mtd
+mvsas
+mvumi
+myri10ge
+national
+natsemi
+nbd
+ne2k-pci
+netconsole
+netxen_nic
+nfs
+nfs_acl
+niu
+nmclan_cs
+ns83820
+ohci-hcd
+on20
+on26
+osd
+osdblk
+osst
+paride
+parport
+pata_ali
+pata_amd
+pata_arasan_cf
+pata_artop
+pata_atiixp
+pata_atp867x
+pata_cmd64x
+pata_cs5520
+pata_cs5530
+pata_efar
+pata_hpt366
+pata_hpt37x
+pata_it8213
+pata_it821x
+pata_jmicron
+pata_marvell
+pata_mpiix
+pata_netcell
+pata_ninja32
+pata_ns87410
+pata_ns87415
+pata_oldpiix
+pata_pcmcia
+pata_pdc2027x
+pata_pdc202xx_old
+pata_piccolo
+pata_rdc
+pata_rz1000
+pata_sc1200
+pata_sch
+pata_serverworks
+pata_sil680
+pata_sis
+pata_triflex
+pata_via
+pcd
+pch_gbe
+pcmcia
+pcmcia_core
+pcnet32
+pcnet_cs
+pd
+pdc_adma
+pf
+pg
+pktcdvd
+plip
+pm8001
+pmcraid
+ppa
+ppp_async
+ppp_deflate
+ppp_generic
+ppp_mppe
+pppoe
+pppox
+ppp_synctty
+pptp
+pt
+qla1280
+qla2xxx
+qla3xxx
+qla4xxx
+qlcnic
+qlge
+qlogic_cs
+qlogicfas408
+qsemi
+r6040
+r8169
+raid_class
+rbd
+realtek
+reiserfs
+rrunner
+s2io
+sata_mv
+sata_nv
+sata_promise
+sata_qstor
+sata_sil
+sata_sil24
+sata_sis
+sata_svw
+sata_sx4
+sata_uli
+sata_via
+sata_vsc
+sb1000
+sc92031
+scsi_debug
+scsi_dh
+scsi_dh_alua
+scsi_dh_emc
+scsi_dh_hp_sw
+scsi_dh_rdac
+scsi_mod
+scsi_tgt
+scsi_transport_fc
+scsi_transport_iscsi
+scsi_transport_sas
+scsi_transport_spi
+scsi_transport_srp
+scsi_wait_scan
+sdhci
+sdhci-pci
+sdhci-pltfm
+sdio_uart
+sd_mod
+sdricoh_cs
+ses
+sfc
+sg
+sis190
+sis900
+skfp
+skge
+sky2
+slhc
+slip
+smc91c92_cs
+smsc
+smsc9420
+snd-seq-device
+soundcore
+sr_mod
+ssb
+st
+starfire
+ste10Xp
+stex
+sundance
+sungem
+sungem_phy
+sunhme
+sunrpc
+sx8
+sym53c500_cs
+sym53c8xx
+tehuti
+tg3
+thermal
+thermal_sys
+tifm_core
+tifm_sd
+tlan
+tmscsim
+tulip
+tun
+typhoon
+udf
+uhci-hcd
+uio
+uli526x
+umem
+ums-alauda
+ums-cypress
+ums-datafab
+ums-eneub6250
+ums-freecom
+ums-isd200
+ums-jumpshot
+ums-karma
+ums-onetouch
+ums-realtek
+ums-sddr09
+ums-sddr55
+ums-usbat
+usb-common
+usbcore
+usbhid
+usb-storage
+ushc
+veth
+via-rhine
+via-sdmmc
+via-velocity
+virtio
+virtio_blk
+virtio_net
+virtio_pci
+virtio_ring
+virtio_scsi
+vitesse
+vmw_pvscsi
+vmxnet3
+vub300
+vxge
+wbsd
+winbond-840
+xen-blkback
+xen-blkfront
+xen-netback
+xen-netfront
+xfs
+xhci-hcd
+xirc2ps_cs
+xircom_cb
+yellowfin
+zlib_deflate
diff --git a/SRC/mkinitramfs-0.2/sbin/mkinitramfs b/SRC/mkinitramfs-0.3/sbin/mkinitramfs
similarity index 88%
rename from SRC/mkinitramfs-0.2/sbin/mkinitramfs
rename to SRC/mkinitramfs-0.3/sbin/mkinitramfs
index e377ed6..72f6b7c 100755
--- a/SRC/mkinitramfs-0.2/sbin/mkinitramfs
+++ b/SRC/mkinitramfs-0.3/sbin/mkinitramfs
@@ -165,17 +165,32 @@ if [ -d /lib/udev ]; then
   cp -a /lib/udev $WDIR/lib
 fi
 
+#ls -lR $WDIR
 mkdir -p $WDIR/lib/modules/$KERNEL_VERSION
 touch $WDIR/lib/modules/$KERNEL_VERSION/modules.{builtin,order}
 
-# Install the kernel modules in use
-# May want to work on removing unnecessary modules at some point
-# though in most cases this should probably be good enough
+# Install kernel modules
 printf "Copying modules...\n"
 
-for module in `cat /proc/modules|awk '{print $1}'`; do
-  cp --parents `modinfo -k $KERNEL_VERSION -F filename $module` $WDIR/;
-done
+if [ $(find /usr/share/mkinitramfs/modules -type f|wc -l) -gt 0 ]; then
+  for file in /usr/share/mkinitramfs/modules/*; do
+    while read name; do
+      module=`modinfo -k $KERNEL_VERSION -F filename $name 2>/dev/null`
+
+      if [ $? -eq 0 ]; then
+        cp --parents $module $WDIR/;
+      fi
+    done < $file
+  done
+else
+  while read name; do
+    module=`modinfo -k $KERNEL_VERSION -F filename $name 2>/dev/null`
+
+    if [ $? -eq 0 ]; then
+      cp --parents $module $WDIR/;
+    fi
+  done < /usr/share/mkinitramfs/default-modules
+fi
 
 cp /lib/modules/$KERNEL_VERSION/modules.{builtin,order} \
   $WDIR/lib/modules/$KERNEL_VERSION
diff --git a/SRC/mkinitramfs-0.3/usr/share/mkinitramfs/default-modules b/SRC/mkinitramfs-0.3/usr/share/mkinitramfs/default-modules
new file mode 100755
index 0000000..2f595a4
--- /dev/null
+++ b/SRC/mkinitramfs-0.3/usr/share/mkinitramfs/default-modules
@@ -0,0 +1,456 @@
+3c574_cs
+3c589_cs
+3c59x
+3w-9xxx
+3w-sas
+3w-xxxx
+8139cp
+8139too
+8390
+a100u2w
+aacraid
+acard-ahci
+acenic
+advansys
+aha152x_cs
+ahci
+aic79xx
+aic7xxx
+aic7xxx_old
+aic94xx
+alx
+amd8111e
+aoe
+arcmsr
+ata_generic
+ata_piix
+aten
+atl1
+atl1c
+atl1e
+atl2
+atp
+atp870u
+auth_rpcgss
+axnet_cs
+b44
+be2iscsi
+be2net
+bfa
+bna
+bnx2
+bnx2fc
+bnx2i
+bnx2x
+bpck
+brd
+broadcom
+bsd_comp
+btrfs
+BusLogic
+cassini
+cb710
+cb710-mmc
+cciss
+cdrom
+ch
+cicada
+cnic
+comm
+configfs
+cpqarray
+crc16
+crc32c
+crc7
+crc-ccitt
+crc-itu-t
+crc-t10dif
+cxgb
+cxgb3
+cxgb3i
+cxgb4
+cxgb4i
+cxgb4vf
+DAC960
+davicom
+dc395x
+dca
+de2104x
+de600
+de620
+defxx
+dl2k
+dmfe
+dm-log
+dm-mirror
+dm-mod
+dm-region-hash
+dm-snapshot
+dmx3191d
+dnet
+dpt_i2o
+drbd
+dstr
+dummy
+e100
+e1000
+e1000e
+eata
+ehci-hcd
+enc28j60
+enclosure
+enic
+epat
+epia
+epic100
+eql
+et1011c
+ethoc
+ext2
+ext3
+ext4
+fan
+fcoe
+fdomain
+fdomain_cs
+fealnx
+ff-memless
+firewire-core
+firewire-ohci
+firewire-sbp2
+fit2
+fit3
+floppy
+fmvj18x_cs
+fnic
+forcedeth
+friq
+frpw
+fscache
+fuse
+gdth
+gre
+hamachi
+hid
+hid-apple
+hid-belkin
+hid-cherry
+hid-chicony
+hid-ezkey
+hid-hyperv
+hid-keytouch
+hid-logitech
+hid-logitech-dj
+hid-microsoft
+hid-monterey
+hid-ortek
+hid-primax
+hid-prodikeys
+hid-roccat
+hid-roccat-arvo
+hid-roccat-common
+hid-samsung
+hid-sjoy
+hid-sunplus
+hid-topseed
+hp100
+hpsa
+hptiop
+hv_netvsc
+hv_storvsc
+hv_vmbus
+i2c-algo-bit
+i2c-core
+i2o_block
+i2o_core
+icplus
+ifb
+igb
+igbvf
+imm
+inet_lro
+initio
+ipg
+ipr
+ips
+isci
+iscsi_boot_sysfs
+iscsi_tcp
+isofs
+ixgb
+ixgbe
+ixgbevf
+jbd
+jbd2
+jfs
+jme
+kbic
+ks8842
+ks8851
+ks8851_mll
+ksz884x
+ktti
+libahci
+libata
+libceph
+libcrc32c
+libcxgbi
+libfc
+libfcoe
+libiscsi
+libiscsi_tcp
+libosd
+libphy
+libsas
+libsrp
+lockd
+loop
+lpfc
+lru_cache
+lxt
+macvlan
+macvtap
+marvell
+mbcache
+mdio
+mdio-bitbang
+megaraid
+megaraid_mbox
+megaraid_mm
+megaraid_sas
+micrel
+mii
+mlx4_core
+mlx4_en
+mmc_block
+mmc_core
+mmc_spi
+mpt2sas
+mptbase
+mptfc
+mptsas
+mptscsih
+mptspi
+mtd
+mvsas
+mvumi
+myri10ge
+national
+natsemi
+nbd
+ne2k-pci
+netconsole
+netxen_nic
+nfs
+nfs_acl
+niu
+nmclan_cs
+ns83820
+ohci-hcd
+on20
+on26
+osd
+osdblk
+osst
+paride
+parport
+pata_ali
+pata_amd
+pata_arasan_cf
+pata_artop
+pata_atiixp
+pata_atp867x
+pata_cmd64x
+pata_cs5520
+pata_cs5530
+pata_efar
+pata_hpt366
+pata_hpt37x
+pata_it8213
+pata_it821x
+pata_jmicron
+pata_marvell
+pata_mpiix
+pata_netcell
+pata_ninja32
+pata_ns87410
+pata_ns87415
+pata_oldpiix
+pata_pcmcia
+pata_pdc2027x
+pata_pdc202xx_old
+pata_piccolo
+pata_rdc
+pata_rz1000
+pata_sc1200
+pata_sch
+pata_serverworks
+pata_sil680
+pata_sis
+pata_triflex
+pata_via
+pcd
+pch_gbe
+pcmcia
+pcmcia_core
+pcnet32
+pcnet_cs
+pd
+pdc_adma
+pf
+pg
+pktcdvd
+plip
+pm8001
+pmcraid
+ppa
+ppp_async
+ppp_deflate
+ppp_generic
+ppp_mppe
+pppoe
+pppox
+ppp_synctty
+pptp
+pt
+qla1280
+qla2xxx
+qla3xxx
+qla4xxx
+qlcnic
+qlge
+qlogic_cs
+qlogicfas408
+qsemi
+r6040
+r8169
+raid_class
+rbd
+realtek
+reiserfs
+rrunner
+s2io
+sata_mv
+sata_nv
+sata_promise
+sata_qstor
+sata_sil
+sata_sil24
+sata_sis
+sata_svw
+sata_sx4
+sata_uli
+sata_via
+sata_vsc
+sb1000
+sc92031
+scsi_debug
+scsi_dh
+scsi_dh_alua
+scsi_dh_emc
+scsi_dh_hp_sw
+scsi_dh_rdac
+scsi_mod
+scsi_tgt
+scsi_transport_fc
+scsi_transport_iscsi
+scsi_transport_sas
+scsi_transport_spi
+scsi_transport_srp
+scsi_wait_scan
+sdhci
+sdhci-pci
+sdhci-pltfm
+sdio_uart
+sd_mod
+sdricoh_cs
+ses
+sfc
+sg
+sis190
+sis900
+skfp
+skge
+sky2
+slhc
+slip
+smc91c92_cs
+smsc
+smsc9420
+snd-seq-device
+soundcore
+sr_mod
+ssb
+st
+starfire
+ste10Xp
+stex
+sundance
+sungem
+sungem_phy
+sunhme
+sunrpc
+sx8
+sym53c500_cs
+sym53c8xx
+tehuti
+tg3
+thermal
+thermal_sys
+tifm_core
+tifm_sd
+tlan
+tmscsim
+tulip
+tun
+typhoon
+udf
+uhci-hcd
+uio
+uli526x
+umem
+ums-alauda
+ums-cypress
+ums-datafab
+ums-eneub6250
+ums-freecom
+ums-isd200
+ums-jumpshot
+ums-karma
+ums-onetouch
+ums-realtek
+ums-sddr09
+ums-sddr55
+ums-usbat
+usb-common
+usbcore
+usbhid
+usb-storage
+ushc
+veth
+via-rhine
+via-sdmmc
+via-velocity
+virtio
+virtio_blk
+virtio_net
+virtio_pci
+virtio_ring
+virtio_scsi
+vitesse
+vmw_pvscsi
+vmxnet3
+vub300
+vxge
+wbsd
+winbond-840
+xen-blkback
+xen-blkfront
+xen-netback
+xen-netfront
+xfs
+xhci-hcd
+xirc2ps_cs
+xircom_cb
+yellowfin
+zlib_deflate
diff --git a/SRC/mkinitramfs-0.2/usr/share/mkinitramfs/init.in b/SRC/mkinitramfs-0.3/usr/share/mkinitramfs/init.in
similarity index 100%
rename from SRC/mkinitramfs-0.2/usr/share/mkinitramfs/init.in
rename to SRC/mkinitramfs-0.3/usr/share/mkinitramfs/init.in