--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2008/06/28 00:37:45	531
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2009/08/04 22:39:22	1169
@@ -21,7 +21,7 @@
 ########################################
 
 ### System/Config Version
-VERSION="0.3.1"
+VERSION="0.3.3"
 TITLE="alxinstall-ng - ${VERSION}"
 
 CDPATH="/mnt/cdrom"
@@ -402,15 +402,35 @@
 	[[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
 	[[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
 
-	echo "default 0" > ${INSTALLPATH}/boot/grub/grub.conf || die
-	echo "timeout 0" >> ${INSTALLPATH}/boot/grub/grub.conf ||die
+	local grubconf=${INSTALLPATH}/boot/grub/grub.conf
+	: > ${grubconf} || die
+	echo "default 0" >> ${grubconf} || die
+	echo "timeout 3" >> ${grubconf} || die
+	# using current root password
+	echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die
+
+	echo  >> ${grubconf} || die
+	echo "# normal boot" >> ${grubconf} || die
+	echo "title ${KRNVER}" >> ${grubconf} || die
+	echo "root (hd0,0)" >> ${grubconf} || die
+	echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet" >> ${grubconf} || die
+	echo "initrd /boot/initrd" >> ${grubconf} || die
+
+	echo >> ${grubconf} || die
+	echo "# admin boot" >> ${grubconf} || die
+	echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
+	echo "lock"  >> ${grubconf} || die
+	echo "root (hd0,0)" >> ${grubconf} || die
+	echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet hardware-auto-detection" >> ${grubconf} || die
+	echo "initrd /boot/initrd" >> ${grubconf} || die
+
+	echo >> ${grubconf} || die
+	echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
+	echo "lock"  >> ${grubconf} || die
+	echo "root (hd0,0)" >> ${grubconf} || die
+	echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet alx-reset-settings" >> ${grubconf} || die
+	echo "initrd /boot/initrd" >> ${grubconf} || die
 
-	echo -e "\ntitle=${KRNVER}" >> ${INSTALLPATH}/boot/grub/grub.conf || die
-	echo "root (hd0,0)" >> ${INSTALLPATH}/boot/grub/grub.conf || die
-	
-	echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet" >> ${INSTALLPATH}/boot/grub/grub.conf || die
-	echo "initrd /boot/initrd" >> ${INSTALLPATH}/boot/grub/grub.conf || die
-	
 	# bootsector schreiben chrooted schreiben (lfs/magellan)
 	cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
 /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
@@ -435,7 +455,7 @@
 install_mkinitrd_chroot()
 {
 	cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
-echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx\"" > /etc/conf.d/mkinitrd
+echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx sd_mod ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via sata_via sata_sis sata_nv\"" > /etc/conf.d/mkinitrd
 mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
 exit 0
 CHROOTEOF