--- mage/branches/alx-0_6_0/include/alx.minc 2011/05/12 00:57:40 2092 +++ mage/branches/alx-0_6_0/include/alx.minc 2011/06/08 08:23:38 2200 @@ -39,6 +39,7 @@ local i local rootfs local grubroot + local grubopts local OLD_IFS local grubconf="/boot/grub/grub.conf" @@ -77,6 +78,17 @@ done IFS="${OLD_IFS}" + # check for special hardware + if [[ -x $(which hwinfo) ]] + then + # zotac devices + if [[ ! -z $(hwinfo --bios | grep -i zotac) ]] + then + grubopts="rootdelay=8" + echo "Special device 'ZOTAC' detected!" + fi + fi + # fix description : > ${grubconf} echo "default 0" >> ${grubconf} @@ -87,18 +99,18 @@ echo "# normal boot" >> ${grubconf} echo "title ${KERNEL_DESCRIPTION}" >> ${grubconf} echo "root ${grubroot}" >> ${grubconf} - echo "kernel ${grubroot}/boot/${KERNEL_IMAGE} ${rootfs} quiet" >> ${grubconf} + echo "kernel ${grubroot}/boot/${KERNEL_IMAGE} ${rootfs} quiet ${grubopts}" >> ${grubconf} echo >> ${grubconf} echo "# admin boots" >> ${grubconf} echo "title ${KERNEL_DESCRIPTION} - Re-run hardware-detection" >> ${grubconf} echo "lock" >> ${grubconf} echo "root ${grubroot}" >> ${grubconf} - echo "kernel ${grubroot}/boot/${KERNEL_IMAGE} ${rootfs} quiet hardware-auto-detection" >> ${grubconf} + echo "kernel ${grubroot}/boot/${KERNEL_IMAGE} ${rootfs} quiet ${grubopts} hardware-auto-detection" >> ${grubconf} echo >> ${grubconf} echo "title ${KERNEL_DESCRIPTION} - Reset *all* local settings" >> ${grubconf} echo "lock" >> ${grubconf} echo "root ${grubroot}" >> ${grubconf} - echo "kernel ${grubroot}/boot/${KERNEL_IMAGE} ${rootfs} quiet alx-reset-settings" >> ${grubconf} + echo "kernel ${grubroot}/boot/${KERNEL_IMAGE} ${rootfs} quiet ${grubopts} alx-reset-settings" >> ${grubconf} } ## compat