From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 15 Jun 2008 08:43:30 +0000 (+0200)
Subject: the mkinitcpio sata hook must also removed if root is hd* because some
X-Git-Tag: v2.3-beta1~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e95c21cf66e9775d1f9bf1501b2ec2ba52b5f4f;p=people%2Fms%2Fipfire-2.x.git

the mkinitcpio sata hook must also removed if root is hd* because some
also steal the ide devices
---

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 7f7d72ad33..e0b96a64d3 100755
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -84,8 +84,9 @@ if [ "${ROOT:0:7}" == "/dev/sd" ]; then
     sed -i "s| ide | |g" /etc/mkinitcpio.conf
 else
 if [ "${ROOT:0:7}" == "/dev/hd" ]; then
-    # Remove pata hook if root is on hda 
+    # Remove pata & sata hook if root is on hda 
     sed -i "s| pata | |g" /etc/mkinitcpio.conf
+    sed -i "s| sata | |g" /etc/mkinitcpio.conf
 fi
 fi
 mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 878d64ee2b..852819b176 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -508,8 +508,9 @@ int main(int argc, char *argv[])
 	    /* Remove the ide hook if we install sda */
 	    replace("/harddisk/etc/mkinitcpio.conf", " ide ", " ");
 	} else {
-	    /* Remove the pata hook if we install hda */
+	    /* Remove the pata & sata hook if we install hda */
 	    replace("/harddisk/etc/mkinitcpio.conf", " pata ", " ");
+	    replace("/harddisk/etc/mkinitcpio.conf", " sata ", " ");
 	}
 	/* Going to make our initrd... */
 	snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);