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 7f7d72ad33838dd6559f68e904da0a55b843150d..e0b96a64d382357e620a7d22f2f1abacbf4dce35 100755 (executable)
--- 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 878d64ee2bdbe85819d602e5f0b266f8e937f5a3..852819b176bd606878d061896114a1705a0adcc4 100644 (file)
--- 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);