--- trunk/installer-simple/bin/installer.sh.in	2014/01/03 14:57:23	2342
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:18:21	2403
@@ -16,13 +16,26 @@
 # -> now in images.conf
 CURRENTLINE=0
 
-# configuration
-if [ -e %SYSCONFDIR%/installer.conf ]
-then
-	source %SYSCONFDIR%/installer.conf
-else
-	die "/etc/installer.conf not found"
-fi
+die()
+{
+	echo "Error: $@"
+	exit 1
+}
+
+# load common includes
+for inc in %SYSCONFDIR%/installer.conf \
+	${INSTALLER_LIBDIR}/functions/common.sh \
+	${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
+	${INSTALLER_LIBDIR}/functions/hwdetection.sh \
+	${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
+do
+	if [ -e ${inc} ]
+	then
+		source "${inc}"
+	else
+		die "'${inc}' not found"
+	fi
+done
 
 # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
 # -> now in images.conf
@@ -39,14 +52,11 @@
 	die "/mnt/cdrom/system/images.conf not found"
 fi
 
-# includes
-source ${INSTALLER_LIBDIR}/functions/hwdetection.sh
-
 ### System/Config Version
 VERSION="%VERSIONTAG%"
 TITLE="${DEFAULT_TITLE} - ${VERSION}"
 
-CDPATH="${DEFAULT_CDPATH}"
+CDROOT="${DEFAULT_CDROOT}"
 INSTALLROOT="${DEFAULT_INSTALLROOT}"
 
 # standard kernel opts
@@ -70,12 +80,6 @@
 #		  DIALOG BOXEN			#
 #################################################
 
-die()
-{
-	echo "Error: $@"
-	exit 1
-}
-
 dialog_die()
 {
 	ERROR="$1"
@@ -86,40 +90,20 @@
 
 dialog_warning()
 {
-	dialog \
-	--backtitle "${TITLE}" \
-	--colors \
-	--defaultno \
-	--yesno "\Z1 !!! Achtung !!! \Zn\n\n\
-	Diese Festplatte wird unwiederruflich geloescht werden.\n\n\
-		Soll ich wirklich fortfahren ?" 10 70
-	RES=$?
-	if [[ ${RES} -eq 1 ]]
+	local retval
+
+	yesnobox $"\Z1 !!! Warning !!! \Zn\n\n\This harddrive will be irreversibly erased.\n\n\Do you want to continue ?"
+	retval=$?
+	if [[ ${retval} -eq 1 ]]
 	then
 		clear
-		echo "Der Vorgang wurde abgebrochen."
+		echo $"The process was aborted."
 		exit 1
 	fi
 }
 
 dialog_setup_hdd_info()
 {
-	local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
-
-	dialog \
-	--colors \
-	--title "[ Festplatten Partitionierung ]" \
-	--backtitle "${TITLE}" \
-	--ok-label "Weiter" \
-	--msgbox "\nBitte legen Sie 3 Partitionen an.\n\n\
-		[ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit ca. 50MB\n\
-		[ \Z3${SHDD}2\Zn ] Typ: \Z3Linux Swap\Zn mit ca. 256MB\n\
-		[ \Z3${SHDD}3\Zn ] Typ: \Z3Linux \Zn mit dem Rest (min. 256MB)\n\n\
-		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
-}
-
-dialog_setup_hdd_info_flash()
-{
 	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
 
 	dialog \
@@ -161,7 +145,6 @@
 	"" "" \
 	"" "\Z1Experten Modi:\Zn" \
 	"2" "Normale IDE-Disk (Manuell)" \
-	"3" "Flash-Speicher (Manuell)")
 	RES=$?
 	[[ ${RES} -eq 1 ]] && return 1
 	if [[ ${RES} -eq 0 ]]
@@ -169,7 +152,6 @@
 		case "${i}" in
 			"1") run_install_auto ;;
 			"2") run_install_normal ;;
-			"3") run_install_flash ;;
 			"") dialog_setup_system_menu;;
 		esac
 	fi
@@ -180,14 +162,14 @@
 	local i
 	local hwtmp
 
-	if [ -x $(which mktemp &> /dev/null) ]
+	if [ -x $(type -P mktemp) ]
 	then
 		hwtmp="$(mktemp)"
 	else
 		hwtmp="/tmp/hwtmp.sh"
 	fi
 
-	[[ ! -z ${installdevs} ]] && installdevs=""
+	run_hardware_detection_disks
 
 	echo "dialog \\"  > ${hwtmp}
 	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
@@ -197,37 +179,24 @@
 	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
 	echo "	Festplatten:\n \\" >> ${hwtmp}
 
-	if [[ ! -z ${scsidisks} ]]
+	if [[ ! -z ${ALL_DISKS} ]]
 	then
-		for i in ${scsidisks}
+		for i in ${ALL_DISKS}
 		do
-			if [[ ${i} != ${cdromdev} ]]
-			then
-				echo "		\\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
-				installdevs="${installdevs} ${i}"
-			fi
+			echo "		\\Z3${i}\\Zn\n \\" >> ${hwtmp}
 		done
 	fi
 
-	if [[ ! -z ${idedisks} ]]
+	if [[ ! -z ${ALL_CDROMS} ]]
 	then
-		for i in ${idedisks}
+		echo "	\n \\" >> ${hwtmp}
+		echo "	CDROM Laufwerke:\n \\" >> ${hwtmp}
+		for i in ${ALL_CDROMS}
 		do
-			if [[ ${i} != ${cdromdev} ]]
-			then
-				echo "		\\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
-				installdevs="${installdevs} ${i}"
-			fi
+			echo "		\\Z3${i}\\Zn\n \\" >> ${hwtmp}
 		done
 	fi
 
-	if [[ ! -z ${cdromdev} ]]
-	then
-		echo "	\n \\" >> ${hwtmp}
-		echo "	\\Z7andere Laufwerke:\n \\" >> ${hwtmp}
-		echo "		CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
-	fi
-
 	# other devices
 	run_hardware_detection
 	case "${SPECIALDEVICE}" in
@@ -290,7 +259,7 @@
 	fi
 }
 
-dialog_setup_hdd_partitions_manuell_flash()
+dialog_setup_hdd_partitions_auto()
 {
 	local i
 
@@ -322,49 +291,26 @@
 		[[ ${RES} -eq 1 ]] && return 1
 		if [[ ${RES} -eq 0 ]]
 		then
-			dialog_setup_hdd_info_flash
-			setup_hdd_partitions_manuell_flash
+			dialog_setup_hdd_info_auto
+			dialog_setup_hdd_create_partitions
+			setup_hdd_partitions_auto
 		fi
 	fi
 }
 
-dialog_setup_hdd_partitions_auto()
+run_hardware_detection_disks()
 {
-	local i
+	local bootdev
 
-	if [[ -z ${installdevs} ]]
+	# all disks but exclude ramdisks
+	export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
+	# remove the boot device from ALL_DISKS if it was an usbstick
+	if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
 	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
+		bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
+		export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
 	fi
+	export ALL_CDROMS="$(get_hwinfo cdrom)"
 }
 
 dialog_setup_hdd_create_partitions()
@@ -606,16 +552,6 @@
 
 setup_hdd_partitions_manuell()
 {
-	BOOTHDD="${HDD}1"
-	SWAPHDD="${HDD}2"
-	ROOTHDD="${HDD}3"
-
-	## hdds partitionieren manuell
-	cfdisk ${HDD} || dialog_die
-}
-
-setup_hdd_partitions_manuell_flash()
-{
 	ROOTHDD="${HDD}1"
 
 	## hdds partitionieren manuell
@@ -624,27 +560,11 @@
 
 setup_hdd_format()
 {
-	mkswap ${SWAPHDD} || dialog_die
-	mke2fs -j -q ${BOOTHDD} || dialog_die
-	mke2fs -j -q ${ROOTHDD} || dialog_die
-}
-
-setup_hdd_format_flash()
-{
 	mke2fs -j -q ${ROOTHDD} || dialog_die
 }
 
 install_mount_rootfs()
 {
-	swapon ${SWAPHDD} || dialog_die
-	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
-	install -d ${INSTALLROOT}/boot || dialog_die
-	mount ${BOOTHDD} ${INSTALLROOT}/boot || dialog_die
-	cd ${INSTALLROOT} || dialog_die
-}
-
-install_mount_rootfs_flash()
-{
 	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
 	install -d ${INSTALLROOT}/boot || dialog_die
 	cd ${INSTALLROOT} || dialog_die
@@ -652,7 +572,7 @@
 
 install_system_image()
 {
-	tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLROOT}
+	tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
 }
 
 install_bootsector_chroot()
@@ -829,7 +749,7 @@
 
 is_uuid_supported()
 {
-	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]
+	if [[ -x $(type -P busybox.mkinitrd) ]]
 	then
 		# only detect uuids if supported
 		if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
@@ -865,10 +785,8 @@
 	# schreibe fstab
 	if is_uuid_supported
 	then
-		echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLROOT}/etc/fstab || dialog_die
 		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
 	else
-		echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLROOT}/etc/fstab || dialog_die
 		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
 	fi
 	# not needed busybox loads all with swapon -a, even if not mentioned in fstab
@@ -893,31 +811,11 @@
 	fi
 }
 
-install_system_settings_flash()
-{
-	# schreibe fstab
-	if is_uuid_supported
-	then
-		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLROOT}/etc/fstab || dialog_die
-	else
-		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLROOT}/etc/fstab || dialog_die
-	fi
-	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
-	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
-}
-
 install_umount_rootfs()
 {
 	cd /
 	umount ${INSTALLROOT}/boot || dialog_die
 	umount ${INSTALLROOT} || dialog_die
-	swapoff ${SWAPHDD} || dialog_die
-}
-
-install_umount_rootfs_flash()
-{
-	cd /
-	umount ${INSTALLROOT} || dialog_die
 }
 
 install_do_reboot()
@@ -951,47 +849,25 @@
 	dialog_install_successful
 }
 
-run_install_flash()
-{
-	dialog_hardware_detection
-
-	dialog_setup_hdd_partitions_manuell_flash
-	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_settings
-	sleep 1
-	install_system_settings_flash
-	install_initrd_chroot
-
-	dialog_install_bootsector
-	install_bootsector_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
+	setup_hdd_format > /dev/null
+	install_mount_rootfs
 	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
 
 	dialog_install_settings
 	sleep 1
-	install_system_settings_flash
+	install_system_settings
 	install_initrd_chroot
 
 	dialog_install_bootsector
 	install_bootsector_chroot
 
-	install_umount_rootfs_flash
+	install_umount_rootfs
 	dialog_install_successful
 }