summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-11-05 21:03:35 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-11-05 21:03:35 -0300
commit469b5b2c5824dfe5960ef7ad0a836fa949039613 (patch)
tree6f85a1327675929ff57cb3c656eeb039be879639
parent59ad1113d9ba60153f0c056711856e7440cc20bb (diff)
downloadarchiso32-469b5b2c5824dfe5960ef7ad0a836fa949039613.tar.xz
[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 <vmlinuz386@yahoo.com.ar>
-rw-r--r--archiso/install/archiso6
-rw-r--r--configs/baseline/mkinitcpio.conf2
-rw-r--r--configs/releng/mkinitcpio.conf2
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"