From 469b5b2c5824dfe5960ef7ad0a836fa949039613 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 5 Nov 2011 21:03:35 -0300 Subject: [archiso] install hook cleanups * Remove IDE stuff. * Remove modules that can be added via relevant hooks. * Replace sata with virtio in baseline profile. Signed-off-by: Gerardo Exequiel Pozzi --- archiso/install/archiso | 6 +----- configs/baseline/mkinitcpio.conf | 2 +- configs/releng/mkinitcpio.conf | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/archiso/install/archiso b/archiso/install/archiso index d32c8ab..0bb0d0f 100644 --- a/archiso/install/archiso +++ b/archiso/install/archiso @@ -1,10 +1,6 @@ build () { - MODULES="cdrom ide-cd_mod ide-core ide-generic loop dm-mod dm-snapshot squashfs isofs $(all_modules '/kernel/fs' | grep -v "nls")" - MODULES="${MODULES} $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd")" - MODULES="${MODULES} usb_storage sd_mod sr_mod" - MODULES="${MODULES} virtio_pci virtio_blk" - MODULES=$(echo ${MODULES}) #trim whitespace + MODULES="cdrom loop dm-snapshot" BINARIES="" FILES="" diff --git a/configs/baseline/mkinitcpio.conf b/configs/baseline/mkinitcpio.conf index 389ec51..a1aafa8 100644 --- a/configs/baseline/mkinitcpio.conf +++ b/configs/baseline/mkinitcpio.conf @@ -1,2 +1,2 @@ -HOOKS="base udev archiso sata filesystems" +HOOKS="base udev archiso virtio filesystems" COMPRESSION="xz" diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf index f6b846c..72e6b2a 100644 --- a/configs/releng/mkinitcpio.conf +++ b/configs/releng/mkinitcpio.conf @@ -1,2 +1,2 @@ -HOOKS="base udev memdisk archiso_shutdown archiso archiso_pxe_nbd archiso_loop_mnt pata scsi sata usb fw pcmcia filesystems usbinput" +HOOKS="base udev memdisk archiso_shutdown archiso archiso_pxe_nbd archiso_loop_mnt pata scsi sata virtio usb fw pcmcia filesystems usbinput" COMPRESSION="xz" -- cgit v1.2.3-70-g09d2