--- trunk/installer-simple/bin/installer.sh.in	2014/01/08 12:14:37	2489
+++ trunk/installer-simple/bin/installer.sh.in	2015/07/31 09:39:45	2882
@@ -9,7 +9,6 @@
 
 # setup locales
 TEXTDOMAIN=installer
-LC_MESSAGES=C
 
 # include dir
 INSTALLER_LIBDIR="%LIBDIR%"
@@ -41,27 +40,13 @@
 	fi
 done
 
-# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
-# -> now in images.conf
-CDIMAGENAME=""
-TOTALLINES=""
-CURRENTLINE=0
-if [ -e /mnt/cdrom/system/images.conf ]
-then
-	source /mnt/cdrom/system/images.conf
-	# check if all required variables are set
-	[[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in /mnt/cdrom/system/images.conf"
-	[[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in /mnt/cdrom/system/images.conf"
-else
-	die "/mnt/cdrom/system/images.conf not found"
-fi
-
 ### System/Config Version
 VERSION="%VERSIONTAG%"
 TITLE="${DEFAULT_TITLE} - ${VERSION}"
 
 # some sane defaults
-CDROOT="${DEFAULT_CDROOT}"
+LIVEROOT="${DEFAULT_LIVEROOT}"
+IMAGEROOT="${DEFAULT_IMAGEROOT}"
 INSTALLROOT="${DEFAULT_INSTALLROOT}"
 KERNELPKG="${DEFAULT_KERNELPKG}"
 KERNELOPTS="${DEFAULT_KERNELOPTS}"
@@ -72,6 +57,20 @@
 FORMFACTOR="${DEFAULT_FORMFACTOR}"
 FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
 
+# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
+# -> now in images.conf
+CDIMAGENAME=""
+TOTALLINES=""
+CURRENTLINE=0
+if [ -e ${IMAGEROOT}/images.conf ]
+then
+	source ${IMAGEROOT}/images.conf
+	# check if all required variables are set
+	[[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in ${IMAGEROOT}/images.conf"
+	[[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in ${IMAGEROOT}/images.conf"
+else
+	die "${IMAGEROOT}/images.conf not found"
+fi
 
 ### helper scripts ###
 
@@ -100,23 +99,69 @@
 	return 0
 }
 
+install_mount_rootfs()
+{
+	local opts
+
+	if [[ -n ${SWAPHDD} ]]
+	then
+		swapon ${SWAPHDD} || die
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		mount -t ${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} ${INSTALL_ROOT} || die
+	fi
+	if [[ -n ${BOOTHDD} ]]
+	then
+		install -d ${INSTALL_ROOT}/boot || die
+		mount -t ${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} ${INSTALL_ROOT}/boot || die
+	fi
+
+	cd ${INSTALL_ROOT} || die
+}
+
+
 mount_rootfs()
 {
 	local retval
 
-	if is_mounted --location "${INSTALLROOT}"
+	if [[ -n ${SWAPHDD} ]]
 	then
-		echo $"${INSTALLROOT} already mounted" >&2
-	else
-		mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive'${ROOTHDD}' -> '${INSTALLROOT}'"
+		swapon ${SWAPHDD} || dialog_die $"Could not enable swap space '${SWAPHDD}'"
 	fi
+
+	if [[ -n ${ROOTHDD} ]]
+	then
+		if is_mounted --location "${INSTALLROOT}"
+		then
+			echo $"${INSTALLROOT} already mounted" >&2
+		else
+			mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"
+		fi
+	fi
+
 	[[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot
+
+	if [[ -n ${BOOTHDD} ]]
+	then
+		if is_mounted --location "${INSTALLROOT}"/boot
+		then
+			echo $"${INSTALLROOT}/boot already mounted" >&2
+		else
+			mount "${BOOTHDD}" "${INSTALLROOT}"/boot || dialog_die $"Could not mount bootfs - drive '${BOOTHDD}' -> '${INSTALLROOT}/boot'"
+		fi
+	fi
 }
 
 umount_rootfs()
 {
 	is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
 	is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
+
+	if [[ -n ${SWAPHDD} ]]
+	then
+		swapoff ${SWAPHDD} || die
+	fi
 }
 
 install_do_reboot()
@@ -130,30 +175,30 @@
 	
 	hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
 
-	## 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 $(echo "${hwinfo}" | grep -i zotac) ]]
-	#then
+	# 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 $(echo "${hwinfo}" | grep -i zotac) ]]
+	then
 		#for i in /sys/block/[hs]d*/removable
 		#do
-			#if [[ $(< ${i}) = 1 ]]
-			#then
-				#removable=1
-			#fi
+		#	if [[ $(< ${i}) = 1 ]]
+		#	then
+		#		removable=1
+		#	fi
 		#done
-		## smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
+		# smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
 
-		## only add this for grub legacy, grub2 detect these settings on its own
-		#export GRUBLEGACYOPTS="rootdelay=8"
-		## there are to zotac types in the wild, nvidia based gfx and intel
-		#if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
-		#then
-			#export SPECIALDEVICE="zotac_nvidia"
-		#else
-			#export SPECIALDEVICE="zotac_intel"
-		#fi
-	#fi
+		# only add this for grub legacy, grub2 detect these settings on its own
+		export GRUBLEGACYOPTS="rootdelay=8"
+		# there are to zotac types in the wild, nvidia based gfx and intel
+		if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
+		then
+			export SPECIALDEVICE="zotac_nvidia"
+		else
+			export SPECIALDEVICE="zotac_intel"
+		fi
+	fi
 
 	# check for special devices/clients:
 	# if a rangee and disk ist smaller then 256mb move partion one block further ahead
@@ -189,17 +234,28 @@
 	# 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 ]]
+	if [[ $(grep '[[:space:]]${LIVEROOT}[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
 	then
-		bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
+		bootdev=$(grep "[[:space:]]${LIVEROOT}[[: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)"
 }
 
-setup_hdd_partitions_auto()
+setup_hdd_partitions()
 {
-	ROOTHDD="${HDD}1"
+	case "${INSTALL_METHOD}" in
+		auto)
+			BOOTHDD=""
+			SWAPHDD=""
+			ROOTHDD="${HDD}1"
+			;;
+		normal)
+			BOOTHDD="${HDD}1"
+			SWAPHDD="${HDD}2"
+			ROOTHDD="${HDD}3"
+			;;
+	esac
 
 	# sanity check - should not happen
 	if is_mounted --device "${ROOTHDD}"
@@ -207,33 +263,43 @@
 		echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2
 		umount "${ROOTHDD}"
 	fi
-
-	# run this only if FDISKPARTITIONBELOW256MB is not already 1
-	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
+	if [[ -n ${BOOTHDD} ]]
 	then
-		if hdd_size_below_256mb ${HDD}
+		if is_mounted --device "${BOOTHDD}"
 		then
-			FDISKPARTIONBELOW256MB=1
-		else
-			FDISKPARTIONBELOW256MB=0
+			echo "partition: device ${BOOTHDD} is already mounted, umount it" >&2
+			umount "${BOOTHDD}"
 		fi
 	fi
 
-	## delete disk
-	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || dialog_die
-
-	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
+	if [[ ${INSTALL_METHOD} = auto ]]
 	then
-		## setup one bootable partition
-		#1. n= new disk
-		#2. p= primary disk
-		#3. 1= first partition
-		#4. 2= default sector start // small disk needs more space for grub2 mbr sector
-		#5. ''= defaul sector end
-		#6. a= bootable flag
-		#7. 1= boot flag for partition 1
-		#8. w= write/quit
-		fdisk ${HDD} &> /dev/null << EOF
+		# run this only if FDISKPARTITIONBELOW256MB is not already 1
+		if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
+		then
+			if device_minimum_size "${HDD}" 256
+			then
+				FDISKPARTIONBELOW256MB=1
+			else
+				FDISKPARTIONBELOW256MB=0
+			fi
+		fi
+
+		## delete disk
+		dd if=/dev/zero of=${HDD} count=1 &> /dev/null || dialog_die
+
+		if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
+		then
+			## setup one bootable partition
+			#1. n= new disk
+			#2. p= primary disk
+			#3. 1= first partition
+			#4. 2= default sector start // small disk needs more space for grub2 mbr sector
+			#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
@@ -243,17 +309,17 @@
 1
 w
 EOF
-	else
-		## 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
+		else
+			## 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
@@ -263,33 +329,54 @@
 1
 w
 EOF
+		fi
+	else
+		cfdisk ${HDD} || dialog_die
 	fi
 }
 
-setup_hdd_partitions_manual()
-{
-	ROOTHDD="${HDD}1"
-	SWAPHDD=""
-	BOOTHDD=""
-	cfdisk ${HDD} || dialog_die
-}
-
 setup_hdd_format()
 {
-	# sanity check - should not happen
-	if is_mounted --device "${ROOTHDD}"
+	if [[ -n ${SWAPHDD} ]]
 	then
-		echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
-		umount "${ROOTHDD}"
+		# sanity check - should not happen
+		if is_mounted --device "${SWAPHDD}"
+		then
+			echo "format: device ${SWAPHDD} is already mounted, umount it" >&2
+			umount "${SWAPHDD}"
+		fi
+		mkswap ${SWAPHDD} || die
+	fi
+
+	if [[ -n ${BOOTHDD} ]]
+	then
+		# sanity check - should not happen
+		if is_mounted --device "${BOOTHDD}"
+		then
+			echo "format: device ${BOOTHDD} is already mounted, umount it" >&2
+			umount "${BOOTHDD}"
+		fi
+
+		mkfs."${FORMAT_FILESYSTEM}" -q "${BOOTHDD}" || dialog_die
 	fi
 
-	mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
+	if [[ -n ${ROOTHDD} ]]
+	then
+		# sanity check - should not happen
+		if is_mounted --device "${ROOTHDD}"
+		then
+			echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
+			umount "${ROOTHDD}"
+		fi
+
+		mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
+	fi
 }
 
 install_system_image()
 {
 	pushd ${INSTALLROOT} > /dev/null
-	tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
+	tar xvjpf ${IMAGEROOT}/${CDIMAGENAME} -C ${INSTALLROOT}
 	popd > /dev/null
 }
 
@@ -300,7 +387,18 @@
 	# write fstab
 	CONFIG="${INSTALLROOT}/etc/fstab"
 	clearconfig
-	addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
+	if [[ -n ${BOOTHDD} ]]
+	then
+		addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t1 1"
+	fi
+	if [[ -n ${ROOTHDD} ]]
+	then
+		addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"
+	fi
+	if [[ -n ${SWAPHDD} ]]
+	then
+		addconfig -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0"
+	fi
 	addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
 	addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
 
@@ -311,18 +409,13 @@
 	addconfig 'NETWORKING="dhcp"'
 
 	# intel framebuffer quirk
-	if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
+	CONFIG="${INSTALLROOT}/etc/splash/splash.conf"
+	if [ -e ${CONFIG} ] && [ -e /proc/fb ]
 	then
-		if [ -e /proc/fb ]
+		if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
 		then
-			if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
-			then
-				fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
-				if [[ ${fbdev} != 0 ]]
-				then
-					sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
-				fi
-			fi
+			fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
+			[[ ${fbdev} != 0 ]] && sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${CONFIG} || dialog_die
 		fi
 	fi
 }
@@ -366,8 +459,8 @@
 	if [[ ${retval} -eq 0 ]]
 	then
 		case "${mode}" in
-			"1") run_install_auto ;;
-			"2") run_install_normal ;;
+			"1") run_install auto ;;
+			"2") run_install normal ;;
 			"") task_setup_system_menu;;
 		esac
 	fi
@@ -417,7 +510,7 @@
 	messagebox -y 12 -h $"Detected hardware:" "${message}"
 }
 
-task_setup_hdd_partitions_manual()
+task_setup_hdd_partitions()
 {
 	local i
 	local retval
@@ -433,29 +526,7 @@
 		if [[ ${retval} -eq 0 ]]
 		then
 			dialog_setup_hdd_info
-			setup_hdd_partitions_manual
-		fi
-	fi
-}
-
-task_setup_hdd_partitions_auto()
-{
-	local i
-	local retval
-
-	if [[ -z ${ALL_DISKS} ]]
-	then
-		dialog_no_harddrive_found
-		exit 1
-	else
-		HDD=$(dialog_select_target_harddrive)
-		retval=$?
-		[[ ${retval} -eq 1 ]] && return 1
-		if [[ ${retval} -eq 0 ]]
-		then
-			dialog_setup_hdd_info_auto
-			dialog_setup_hdd_create_partitions
-			setup_hdd_partitions_auto
+			setup_hdd_partitions
 		fi
 	fi
 }
@@ -482,39 +553,25 @@
 	done
 }
 
-run_install_normal()
+run_install()
 {
-	task_hardware_detection
-
-	task_setup_hdd_partitions_manual
-	dialog_setup_hdd_format
-	setup_hdd_format > /dev/null
-	mount_rootfs
-	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
-
-	dialog_install_settings
-	sleep 1
-	install_system_settings
-	if is_initrd_supported
-	then
-		dialog_install_initrd
-		initrd_config
-		initrd_install
-	fi
-
-	dialog_install_bootsector
-	bootloader_config
-	bootloader_install
-
-	umount_rootfs
-	dialog_install_successful
-}
+	local method="$1"
 
-run_install_auto()
-{
 	task_hardware_detection
 
-	task_setup_hdd_partitions_auto
+	case "${method}" in
+		auto)
+			export INSTALL_METHOD="${method}"
+			;;
+		normal)
+			export INSTALL_METHOD="${method}"
+			;;
+		*)
+			die "Unknown install method '${method}', aborting."
+			;;
+	esac
+
+	task_setup_hdd_partitions
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	mount_rootfs