--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2015/07/23 09:33:29	6824
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2015/07/23 10:50:11	6825
@@ -16,30 +16,38 @@
 VERSION="@@VERSION@@"
 TITLE="alxinstall-ng - ${VERSION}"
 
+# locations
 CDPATH="/mnt/cdrom"
 INSTALLPATH="/mnt/magellan"
 
-### linecount of system.tar.gz -1 !
-CURRENTLINE=0
-#TOTALLINES=11072 # -> now in images.conf
-
+# default system settings
 # standard kernel opts
-KERNELOPTS="quiet video=1024x768"
+DEFAULT_KERNELOPTS="quiet video=1024x768"
 
 # grub options
-GRUBLEGACYOPTS=""
-GRUB2OPTS=""
-GRUB2GFXPAYLOAD="1024x768x16,1024x768"
-
-# fdisk options
-FDISKPARTIONBELOW256MB=0
+DEFAULT_GRUBLEGACYOPTS=""
+DEFAULT_GRUB2OPTS=""
+DEFAULT_GRUB2GFXPAYLOAD="1024x768x16,1024x768"
 
 # default specialdevices
-SPECIALDEVICE=""
-FORMFACTOR="desktop"
+DEFAULT_FORMFACTOR="desktop"
 
 # target filesystem
-FORMAT_FILESYSTEM="ext4"
+DEFAULT_FORMAT_FILESYSTEM="ext4"
+
+# initialize global variables so they are exportable
+INSTALL_METHOD=""
+KERNELOPTS=""
+GRUBLEGACYOPTS=""
+GRUB2OPTS=""
+GRUB2GFXPAYLOAD=""
+FORMFACTOR=""
+FORMAT_FILESYSTEM=""
+FDISKPARTIONBELOW256MB=0
+SPECIALDEVICE=""
+### linecount of system.tar.gz -1 !
+CURRENTLINE=0
+#TOTALLINES=11072 # -> now in images.conf
 
 #################################################
 #		  DIALOG BOXES			#
@@ -136,9 +144,9 @@
 	if [[ ${RES} -eq 0 ]]
 	then
 		case "${i}" in
-			"1") run_install_auto ;;
-			"2") run_install_normal ;;
-			"3") run_install_single ;;
+			"1") run_install auto ;;
+			"2") run_install normal ;;
+			"3") run_install single ;;
 			"") dialog_setup_system_menu;;
 		esac
 	fi
@@ -594,17 +602,17 @@
 
 setup_hdd_partitions_manuell()
 {
-	BOOTHDD="${HDD}1"
-	SWAPHDD="${HDD}2"
-	ROOTHDD="${HDD}3"
-
-	## hdds partitionieren manuell
-	cfdisk ${HDD} || die
-}
-
-setup_hdd_partitions_manuell_single()
-{
-	ROOTHDD="${HDD}1"
+	case "${INSTALL_METHOD}" in
+		normal)
+			BOOTHDD="${HDD}1"
+			SWAPHDD="${HDD}2"
+			ROOTHDD="${HDD}3"
+			;;
+
+		single|auto)
+			ROOTHDD="${HDD}1"
+			;;
+	esac
 
 	## hdds partitionieren manuell
 	cfdisk ${HDD} || die
@@ -612,29 +620,36 @@
 
 setup_hdd_format()
 {
-	mkswap ${SWAPHDD} || die
-	mke2fs -j -q ${BOOTHDD} || die
-	mke2fs -j -q ${ROOTHDD} || die
-}
-
-setup_hdd_format_single()
-{
-	mke2fs -j -q ${ROOTHDD} || die
+	if [[ -n ${SWAPHDD} ]]
+	then
+		mkswap ${SWAPHDD} || die
+	fi
+	if [[ -n ${BOOTHDD} ]]
+	then
+		mke2fs -j -q ${BOOTHDD} || die
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		mke2fs -j -q ${ROOTHDD} || die
+	fi
 }
 
 install_mount_rootfs()
 {
-	swapon ${SWAPHDD} || die
-	mount ${ROOTHDD} ${INSTALLPATH} || die
-	install -d ${INSTALLPATH}/boot || die
-	mount ${BOOTHDD} ${INSTALLPATH}/boot || die
-	cd ${INSTALLPATH} || die
-}
+	if [[ -n ${SWAPHDD} ]]
+	then
+		swapon ${SWAPHDD} || die
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		mount ${ROOTHDD} ${INSTALLPATH} || die
+	fi
+	if [[ -n ${BOOTHDD} ]]
+	then
+		install -d ${INSTALLPATH}/boot || die
+		mount ${BOOTHDD} ${INSTALLPATH}/boot || die
+	fi
 
-install_mount_rootfs_single()
-{
-	mount ${ROOTHDD} ${INSTALLPATH} || die
-	install -d ${INSTALLPATH}/boot || die
 	cd ${INSTALLPATH} || die
 }
 
@@ -855,11 +870,23 @@
 	# schreibe fstab
 	if is_uuid_supported
 	then
-		echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
-		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+		if [[ -n ${BOOTHDD} ]]
+		then
+			echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+		fi
+		if [[ -n ${ROOTHDD} ]]
+		then
+			echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+		fi
 	else
-		echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
-		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+		if [[ -n ${BOOTHDD} ]]
+		then
+			echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+		fi
+		if [[ -n ${ROOTHDD} ]]
+		then
+			echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+		fi
 	fi
 	# not needed busybox loads all with swapon -a, even if not mentioned in fstab
 	#echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
@@ -883,31 +910,21 @@
 	fi
 }
 
-install_system_settings_single()
-{
-	# write fstab
-	if is_uuid_supported
-	then
-		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
-	else
-		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\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
-}
-
 install_umount_rootfs()
 {
 	cd /
-	umount ${INSTALLPATH}/boot || die
-	umount ${INSTALLPATH} || die
-	swapoff ${SWAPHDD} || die
-}
-
-install_umount_rootfs_single()
-{
-	cd /
-	umount ${INSTALLPATH} || die
+	if [[ -n ${BOOTHDD} ]]
+	then
+		umount ${INSTALLPATH}/boot || die
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		umount ${INSTALLPATH} || die
+	fi
+	if [[ -n ${SWAPHDD} ]]
+	then
+		swapoff ${SWAPHDD} || die
+	fi
 }
 
 install_do_reboot()
@@ -919,11 +936,40 @@
 #	     Install Main Scripts		#
 #################################################
 
-run_install_normal()
+run_install()
 {
+	local method="$1"
+
+	# setup install environment
+	export KERNELOPTS="${DEFAULT_KERNELOPTS}"
+	export GRUBLEGACYOPTS="${GRUBLEGACYOPTS}"
+	export GRUB2OPTS="${GRUB2OPTS}"
+	export GRUB2GFXPAYLOAD="${DEFAULT_GRUB2GFXPAYLOAD}"
+	export FORMFACTOR="${DEFAULT_FORMFACTOR}"
+	export FORMAT_FILESYSTEM="${DEFAULT_FORMAT_FILESYSTEM}"
+
+	case "${method}" in
+		auto)
+			export INSTALL_METHOD="${method}"
+			;;
+		normal)
+			export INSTALL_METHOD="${method}"
+			;;
+		single)
+			export INSTALL_METHOD="${method}"
+			;;
+		*)
+			echo "Unknown install method '${method}', aborting."
+			exit 1
+			;;
+	esac
+
 	dialog_hardware_detection
 
-	dialog_setup_hdd_partitions_manuell
+	case "${INSTALL_METHOD}" in
+		auto) dialog_setup_hdd_partitions_auto ;;
+		*) dialog_setup_hdd_partitions_manuell ;;
+	esac
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
@@ -941,50 +987,6 @@
 	dialog_install_successful
 }
 
-run_install_single()
-{
-	dialog_hardware_detection
-
-	dialog_setup_hdd_partitions_manuell_single
-	dialog_setup_hdd_format
-	setup_hdd_format_single > /dev/null
-	install_mount_rootfs_single
-	(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_single
-	install_initrd_chroot
-
-	dialog_install_bootsector
-	install_bootsector_chroot
-
-	install_umount_rootfs_single
-	dialog_install_successful
-}
-
-run_install_auto()
-{
-	dialog_hardware_detection
-
-	dialog_setup_hdd_partitions_auto
-	dialog_setup_hdd_format
-	setup_hdd_format_single > /dev/null
-	install_mount_rootfs_single
-	(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_single
-	install_initrd_chroot
-
-	dialog_install_bootsector
-	install_bootsector_chroot
-
-	install_umount_rootfs_single
-	dialog_install_successful
-}
-
 dialog_main
 
 exit 0