From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 May 2008 15:40:25 +0000 (+0200)
Subject: Removed also the pata mkinitcpio hook if install on hda
X-Git-Tag: v2.3-beta1~48^2~31
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e62ab04d2d68d02dc693b7fb57a3423212079b3b

Removed also the pata mkinitcpio hook if install on hda
---

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 72af0ce59a..4cd8ffd073 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);