--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2011/07/04 21:24:46	2573
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2011/08/11 14:58:15	2736
@@ -34,6 +34,10 @@
 # standard kernel opts
 KERNELOPTS="quiet video=1024x768"
 
+# grub options
+GRUBLEGACYOPTS=""
+GRUB2OPTS=""
+
 # default specialdevices
 SPECIALDEVICE=""
 
@@ -444,7 +448,8 @@
 			fi
 		done
 
-		export KERNELOPTS="${KERNELOPTS} rootdelay=8"
+		# only add this for grub legacy, grub2 detect these settings on its own
+		export GRUBLEGACYOPTS="rootdelay=8"
 		export SPECIALDEVICE="zotac"
 	fi
 }
@@ -591,7 +596,7 @@
 		echo "# normal boot" >> ${grubconf} || die
 		echo "title ${KRNVER}" >> ${grubconf} || die
 		echo "root (hd0,0)" >> ${grubconf} || die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS}" >> ${grubconf} || die
+		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die
 		if is_initrd_supported
 		then
 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
@@ -602,7 +607,7 @@
 		echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
 		echo "lock"  >> ${grubconf} || die
 		echo "root (hd0,0)" >> ${grubconf} || die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} hardware-auto-detection" >> ${grubconf} || die
+		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die
 		if is_initrd_supported
 		then
 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
@@ -612,7 +617,7 @@
 		echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
 		echo "lock"  >> ${grubconf} || die
 		echo "root (hd0,0)" >> ${grubconf} || die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} alx-reset-settings" >> ${grubconf} || die
+		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die
 		if is_initrd_supported
 		then
 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die