--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2009/08/05 19:30:37	1187
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2010/10/18 11:46:02	1574
@@ -21,7 +21,7 @@
 ########################################
 
 ### System/Config Version
-VERSION="0.3.4"
+VERSION="0.3.5"
 TITLE="alxinstall-ng - ${VERSION}"
 
 CDPATH="/mnt/cdrom"
@@ -31,6 +31,11 @@
 CURRENTLINE=0
 #TOTALLINES=11072 # -> now in images.conf
 
+# standart kernel opts
+KERNELOPTS="quiet"
+
+# default specialdevices
+SPECIALDEVICE=""
 
 #################################################
 #		  DIALOG BOXEN			#
@@ -92,6 +97,19 @@
 		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
 }
 
+dialog_setup_hdd_info_auto()
+{
+	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
+
+	dialog \
+	--colors \
+	--title "[ Festplatten Partitionierung ]" \
+	--backtitle "${TITLE}" \
+	--ok-label "Weiter" \
+	--msgbox "\nAchtung!\n\
+		Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81
+}
+
 dialog_setup_system_menu()
 {
 	local i
@@ -103,32 +121,42 @@
 	--ok-label "Weiter" \
 	--stdout \
 	--menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
-	"1" "Normale IDE-Disk" \
-	"2" "Flash-Speicher")
+	"1" "Automatisches Setup" \
+	"2" "Normale IDE-Disk (manuell)" \
+	"3" "Flash-Speicher (manuell)")
 	RES=$?
 	[[ ${RES} -eq 1 ]] && return 1
 	if [[ ${RES} -eq 0 ]]
 	then
 		case "${i}" in
-        		"1") run_install_normal ;;
-			"2") run_install_flash ;;
+			"1") run_install_auto ;;
+        		"2") run_install_normal ;;
+			"3") run_install_flash ;;
 		esac
 	fi
 }
 
-dialog_setup_hdd_found_manuell()
+dialog_hardware_detection()
 {
 	local i
+	local hwtmp
+
+	if [ -x $(which mktemp &> /dev/null) ]
+	then
+		hwtmp="$(mktemp)"
+	else
+		hwtmp="/tmp/hwtmp.sh"
+	fi
 
 	[[ ! -z ${installdevs} ]] && installdevs=""
 
-	echo "dialog \\"  > /tmp/hddtmp.sh
-	echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
-	echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
-	echo "--stdout \\" >> /tmp/hddtmp.sh
-	echo "--colors \\" >> /tmp/hddtmp.sh
-	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> /tmp/hddtmp.sh
-	echo "	Festplatten:\n \\" >> /tmp/hddtmp.sh
+	echo "dialog \\"  > ${hwtmp}
+	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
+	echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
+	echo "--stdout \\" >> ${hwtmp}
+	echo "--colors \\" >> ${hwtmp}
+	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
+	echo "	Festplatten:\n \\" >> ${hwtmp}
 
 	if [[ ! -z ${scsidisks} ]]
 	then
@@ -136,7 +164,7 @@
 		do
 			if [[ ${i} != ${cdromdev} ]]
 			then
-				echo "		\\Z7SCSI: \\Z3${i}\\Zn\n \\" >> /tmp/hddtmp.sh
+				echo "		\\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
 				installdevs="${installdevs} ${i}"
 			fi
 		done
@@ -148,7 +176,7 @@
 		do
 			if [[ ${i} != ${cdromdev} ]]
 			then
-				echo "		\\Z7IDE:  \\Z3${i}\\Zn\n \\" >> /tmp/hddtmp.sh
+				echo "		\\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
 				installdevs="${installdevs} ${i}"
 			fi
 		done
@@ -156,13 +184,27 @@
 
 	if [[ ! -z ${cdromdev} ]]
 	then
-		echo "	\n \\" >> /tmp/hddtmp.sh
-		echo "	\\Z7andere Laufwerke:\n \\" >> /tmp/hddtmp.sh
-		echo "		CDROM: \\Z3${cdromdev}\\Zn\n \\" >> /tmp/hddtmp.sh
-	fi
-	echo "	\" 13 70" >> /tmp/hddtmp.sh
-	chmod a+x /tmp/hddtmp.sh
-	/tmp/hddtmp.sh
+		echo "	\n \\" >> ${hwtmp}
+		echo "	\\Z7andere Laufwerke:\n \\" >> ${hwtmp}
+		echo "		CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
+	fi
+
+	# other devices
+	run_hardware_detection
+	case "${SPECIALDEVICE}" in
+		zotac) echo "	\n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
+		*) echo "	\n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
+	esac
+
+	echo "	\" 13 70" >> ${hwtmp}
+	chmod a+x ${hwtmp}
+	${hwtmp}
+
+	# remove tmp file
+	if [[ -f ${hwtmp} ]]
+	then
+		rm ${hwtmp}
+	fi
 }
 
 dialog_setup_hdd_partitions_manuell()
@@ -241,6 +283,52 @@
 	fi
 }
 
+dialog_setup_hdd_partitions_auto()
+{
+	local i
+
+	if [[ -z ${installdevs} ]]
+	then
+		dialog \
+		--backtitle "${TITLE}" \
+		--ok-label "Beenden" \
+		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
+		exit 1
+	else
+
+		echo "dialog \\" > /tmp/hddtmp.sh
+		echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
+		echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
+		echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
+		echo "--stdout \\" >> /tmp/hddtmp.sh
+		echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
+
+		for i in ${installdevs}
+		do
+			echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
+		done
+		echo -e "\n" >> /tmp/hddtmp.sh
+
+		chmod a+x /tmp/hddtmp.sh
+		HDD="$(/tmp/hddtmp.sh)"
+		RES=$?
+		[[ ${RES} -eq 1 ]] && return 1
+		if [[ ${RES} -eq 0 ]]
+		then
+			dialog_setup_hdd_info_auto
+			dialog_setup_hdd_create_partitions
+			setup_hdd_partitions_auto
+		fi
+	fi
+}
+
+dialog_setup_hdd_create_partitions()
+{
+	dialog \
+	--backtitle "${TITLE}" \
+	--infobox "Erstelle Disk Partitionen ..." 3 70
+}
+
 dialog_setup_hdd_format()
 {
 	dialog \
@@ -323,7 +411,7 @@
 		then
 			case ${METHOD} in
         			"1") dialog_setup_system_menu ;;
-				"2") dialog_setup_hdd_found_manuell ;;
+				"2") dialog_hardware_detection ;;
 				"3") install_do_reboot ;;
 				"4") /bin/bash --login -i ;;
 			esac
@@ -334,6 +422,54 @@
 #################################################
 #		Install Komandos		#
 #################################################
+run_hardware_detection()
+{
+	# check for special devices/clients:
+	# if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
+	local removable=0
+	if [[ ! -z $(lspci -v | grep -i zotac) ]]
+	then
+		for i in /sys/block/[hs]d*/removable
+		do
+			if [[ $(< ${i}) = 1 ]]
+			then
+				removable=1
+			fi
+		done
+
+		export KERNELOPTS="${KERNELOPTS} rootdelay=8"
+		export SPECIALDEVICE="zotac"
+	fi
+}
+
+setup_hdd_partitions_auto()
+{
+	ROOTHDD="${HDD}1"
+
+	## delete disk
+	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
+
+	## setup one bootable partition
+	#1. n= new disk
+	#2. p= primary disk
+	#3. 1= first partition
+	#4. ''= default sector start
+	#5. ''= defaul sector end
+	#6. a= bootable flag
+	#7. 1= boot flag for partition 1
+	#8. w= write/quit
+	fdisk ${HDD} &> /dev/null << EOF
+n
+p
+1
+
+
+a
+1
+w
+EOF
+}
+
 setup_hdd_partitions_manuell()
 {
 	BOOTHDD="${HDD}1"
@@ -387,6 +523,8 @@
 
 install_bootsector_chroot()
 {
+	local my_roothdd
+
 	### grubconf schreiben
 	source ${INSTALLPATH}/boot/kernelversion
 
@@ -401,6 +539,15 @@
 
 	[[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
 	[[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
+	[[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
+
+	# uuid support
+	if is_uuid_supported
+	then
+		my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
+	else
+		my_roothdd="${ROOTHDD}"
+	fi
 
 	local grubconf=${INSTALLPATH}/boot/grub/grub.conf
 	: > ${grubconf} || die
@@ -413,23 +560,32 @@
 	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 "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS}" >> ${grubconf} || die
+	if is_initrd_supported
+	then
+		echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+	fi
 
 	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 "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} hardware-auto-detection" >> ${grubconf} || die
+	if is_initrd_supported
+	then
+		echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+	fi
 
 	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 "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} alx-reset-settings" >> ${grubconf} || die
+	if is_initrd_supported
+	then
+		echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+	fi
 
 	# bootsector schreiben chrooted schreiben (lfs/magellan)
 	cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
@@ -452,8 +608,18 @@
 	rm ${INSTALLPATH}/root/.bashrc
 }
 
-install_mkinitrd_chroot()
+is_initrd_supported()
 {
+	# only generate initrds if the cmd exists
+	[[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0
+	return 1
+}
+
+install_initrd_chroot()
+{
+	# only generate initrds if the cmd exists
+	is_initrd_supported || return 0
+
 	cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
 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
@@ -471,12 +637,26 @@
 	rm ${INSTALLPATH}/root/.bashrc
 }
 
-get_blkid()
+is_uuid_supported()
+{
+	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]
+	then
+		# only detect uuids if supported
+		if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
+		then
+			return 0
+		fi
+	fi
+
+	return 1
+}
+
+get_uuid()
 {
 	local UUID
 	local SEC_TYPE
 	local TYPE
-	
+
 	local dev="$1"
 	[[ -z ${dev} ]] && die "no dev given"
 
@@ -487,16 +667,22 @@
 	else
 		eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
 	fi
-	echo ${UUID}
+	echo "${UUID}"
 }
 
 install_system_settings()
 {
 	# schreibe fstab
-	echo -e "UUID=$(get_blkid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
-	echo -e "UUID=$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+	if is_uuid_supported
+	then
+		echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+	else
+		echo -e "${BOOTHDD}\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+		echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+	fi
 	# not needed busybox loads all with swapon -a, even if not mentioned in fstab
-	#echo -e "UUID='$(get_blkid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+	#echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
 	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
 	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
 
@@ -507,7 +693,12 @@
 install_system_settings_flash()
 {
 	# schreibe fstab
-	echo -e "UUID=$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
+	if is_uuid_supported
+	then
+		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
+	else
+		echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
+	fi
 	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
 	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
 }
@@ -537,7 +728,7 @@
 
 run_install_normal()
 {
-	dialog_setup_hdd_found_manuell
+	dialog_hardware_detection
 
 	dialog_setup_hdd_partitions_manuell
 	dialog_setup_hdd_format
@@ -551,14 +742,14 @@
 	dialog_install_settings
 	sleep 1
 	install_system_settings
-	install_mkinitrd_chroot
+	install_initrd_chroot
 	install_umount_rootfs
 	dialog_install_successful
 }
 
 run_install_flash()
 {
-	dialog_setup_hdd_found_manuell
+	dialog_hardware_detection
 
 	dialog_setup_hdd_partitions_manuell_flash
 	dialog_setup_hdd_format
@@ -572,7 +763,28 @@
 	dialog_install_settings
 	sleep 1
 	install_system_settings_flash
-	install_mkinitrd_chroot
+	install_initrd_chroot
+	install_umount_rootfs_flash
+	dialog_install_successful
+}
+
+run_install_auto()
+{
+	dialog_hardware_detection
+
+	dialog_setup_hdd_partitions_auto
+	dialog_setup_hdd_format
+	setup_hdd_format_flash > /dev/null
+	install_mount_rootfs_flash
+	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
+
+	dialog_install_bootsector
+	install_bootsector_chroot
+
+	dialog_install_settings
+	sleep 1
+	install_system_settings_flash
+	install_initrd_chroot
 	install_umount_rootfs_flash
 	dialog_install_successful
 }