From cdb7903f6231232d5bb3356c3ff12bab882dbcc9 Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Sep 17 2013 14:33:59 +0000 Subject: Add nvme.ko to modules.block for anaconda --- diff --git a/kernel.spec b/kernel.spec index 79b077a..da22ff0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1769,13 +1769,16 @@ BuildKernel() { collect_modules_list() { sed -r -n -e "s/^([^ ]+) \\.?($2)\$/\\1/p" drivers.undef | - LC_ALL=C sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$1 + LC_ALL=C sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$1 + if [ ! -z "$3" ]; then + grep -v "$3" $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$1 + fi } collect_modules_list networking \ 'register_netdev|ieee80211_register_hw|usbnet_probe|phy_driver_register|rt(l_|2x00)(pci|usb)_probe|register_netdevice' collect_modules_list block \ - 'ata_scsi_ioctl|scsi_add_host|scsi_add_host_with_dma|blk_init_queue|register_mtd_blktrans|scsi_esp_register|scsi_register_device_handler|blk_queue_physical_block_size' + 'ata_scsi_ioctl|scsi_add_host|scsi_add_host_with_dma|blk_alloc_queue|blk_init_queue|register_mtd_blktrans|scsi_esp_register|scsi_register_device_handler|blk_queue_physical_block_size' 'pktcdvd.ko|dm-mod.ko' collect_modules_list drm \ 'drm_open|drm_init' collect_modules_list modesetting \ @@ -2299,6 +2302,9 @@ fi # ||----w | # || || %changelog +* Tue Sep 17 2013 Kyle McMartin +- Add nvme.ko to modules.block for anaconda. + * Tue Sep 17 2013 Josh Boyer - 3.12.0-0.rc1.git0.1 - Linux v3.12-rc1 - Disable debugging options.