From e62ab04d2d68d02dc693b7fb57a3423212079b3b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 28 May 2008 17:40:25 +0200 Subject: [PATCH] Removed also the pata mkinitcpio hook if install on hda --- src/install+setup/install/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 72af0ce59..4cd8ffd07 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -501,9 +501,13 @@ int main(int argc, char *argv[]) replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); } - /* Remove the ide hook if we install sda */ + /* mkinitcpio has a problem if ide and pata are included */ if ( scsi_disk==1 ) { - replace("/harddisk/etc/mkinitcpio.conf", " ide ", " "); + /* Remove the ide hook if we install sda */ + replace("/harddisk/etc/mkinitcpio.conf", " ide ", " "); + } else { + /* Remove the pata hook if we install hda */ + replace("/harddisk/etc/mkinitcpio.conf", " pata ", " "); } /* Going to make our initrd... */ snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd.img -k %s-ipfire", KERNEL_VERSION); -- 2.39.2