--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:18:21	2403
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:29:00	2410
@@ -56,30 +56,34 @@
 VERSION="%VERSIONTAG%"
 TITLE="${DEFAULT_TITLE} - ${VERSION}"
 
+# some sane defaults
 CDROOT="${DEFAULT_CDROOT}"
 INSTALLROOT="${DEFAULT_INSTALLROOT}"
-
-# standard kernel opts
-KERNELOPTS="quiet video=1024x768"
-
-# grub options
+KERNELPKG="${DEFAULT_KERNELPKG}"
+KERNELOPTS="${DEFAULT_KERNELOPTS}"
 GRUBLEGACYOPTS=""
 GRUB2OPTS=""
-
-# fdisk options
 FDISKPARTIONBELOW256MB=0
-
-# default specialdevices
 SPECIALDEVICE=""
-FORMFACTOR="desktop"
-
-# target filesystem
+FORMFACTOR="${DEFAULT_FORMFACTOR}"
 FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
 
 #################################################
 #		  DIALOG BOXEN			#
 #################################################
 
+trap_exit()
+{
+	is_mounted --location "${INSTALLROOT}/dev" && umount ${INSTALLROOT}/dev
+	is_mounted --location "${INSTALLROOT}/proc" && umount ${INSTALLROOT}/proc
+	is_mounted --location "${INSTALLROOT}/sys" && umount ${INSTALLROOT}/sys
+	is_mounted --location "${INSTALLROOT}/boot" && umount ${INSTALLROOT}/boot
+	is_mounted --location "${INSTALLROOT}" && umount ${INSTALLROOT}
+
+	echo $"Installation aborted."
+	exit 1
+}
+
 dialog_die()
 {
 	ERROR="$1"
@@ -104,7 +108,7 @@
 
 dialog_setup_hdd_info()
 {
-	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
+	local SHDD="${HDD//\/dev\/}"
 
 	dialog \
 	--colors \
@@ -118,7 +122,7 @@
 
 dialog_setup_hdd_info_auto()
 {
-	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
+	local SHDD="${HDD//\/dev\/}"
 
 	dialog \
 	--colors \
@@ -871,6 +875,9 @@
 	dialog_install_successful
 }
 
+# set some proper traps
+trap "trap_exit" SIGINT SIGQUIT
+
 dialog_main
 
 exit 0