--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2015/07/21 12:26:10	6771
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2015/07/22 11:08:40	6799
@@ -95,7 +95,7 @@
 		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
 }
 
-dialog_setup_hdd_info_flash()
+dialog_setup_hdd_info_simple()
 {
 	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
 
@@ -146,7 +146,7 @@
 		case "${i}" in
 			"1") run_install_auto ;;
 			"2") run_install_normal ;;
-			"3") run_install_flash ;;
+			"3") run_install_simple ;;
 			"") dialog_setup_system_menu;;
 		esac
 	fi
@@ -268,7 +268,7 @@
 	fi
 }
 
-dialog_setup_hdd_partitions_manuell_flash()
+dialog_setup_hdd_partitions_manuell_simple()
 {
 	local i
 
@@ -300,8 +300,8 @@
 		[[ ${RES} -eq 1 ]] && return 1
 		if [[ ${RES} -eq 0 ]]
 		then
-			dialog_setup_hdd_info_flash
-			setup_hdd_partitions_manuell_flash
+			dialog_setup_hdd_info_simple
+			setup_hdd_partitions_manuell_simple
 		fi
 	fi
 }
@@ -610,7 +610,7 @@
 	cfdisk ${HDD} || die
 }
 
-setup_hdd_partitions_manuell_flash()
+setup_hdd_partitions_manuell_simple()
 {
 	ROOTHDD="${HDD}1"
 
@@ -625,7 +625,7 @@
 	mke2fs -j -q ${ROOTHDD} || die
 }
 
-setup_hdd_format_flash()
+setup_hdd_format_simple()
 {
 	mke2fs -j -q ${ROOTHDD} || die
 }
@@ -639,7 +639,7 @@
 	cd ${INSTALLPATH} || die
 }
 
-install_mount_rootfs_flash()
+install_mount_rootfs_simple()
 {
 	mount ${ROOTHDD} ${INSTALLPATH} || die
 	install -d ${INSTALLPATH}/boot || die
@@ -891,7 +891,7 @@
 	fi
 }
 
-install_system_settings_flash()
+install_system_settings_simple()
 {
 	# schreibe fstab
 	if is_uuid_supported
@@ -912,7 +912,7 @@
 	swapoff ${SWAPHDD} || die
 }
 
-install_umount_rootfs_flash()
+install_umount_rootfs_simple()
 {
 	cd /
 	umount ${INSTALLPATH} || die
@@ -949,25 +949,25 @@
 	dialog_install_successful
 }
 
-run_install_flash()
+run_install_simple()
 {
 	dialog_hardware_detection
 
-	dialog_setup_hdd_partitions_manuell_flash
+	dialog_setup_hdd_partitions_manuell_simple
 	dialog_setup_hdd_format
-	setup_hdd_format_flash > /dev/null
-	install_mount_rootfs_flash
+	setup_hdd_format_simple > /dev/null
+	install_mount_rootfs_simple
 	(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_simple
 	install_initrd_chroot
 
 	dialog_install_bootsector
 	install_bootsector_chroot
 
-	install_umount_rootfs_flash
+	install_umount_rootfs_simple
 	dialog_install_successful
 }
 
@@ -977,19 +977,19 @@
 
 	dialog_setup_hdd_partitions_auto
 	dialog_setup_hdd_format
-	setup_hdd_format_flash > /dev/null
-	install_mount_rootfs_flash
+	setup_hdd_format_simple > /dev/null
+	install_mount_rootfs_simple
 	(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_simple
 	install_initrd_chroot
 
 	dialog_install_bootsector
 	install_bootsector_chroot
 
-	install_umount_rootfs_flash
+	install_umount_rootfs_simple
 	dialog_install_successful
 }