--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:13:11	2429
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:20:31	2434
@@ -281,29 +281,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
-		for i in /sys/block/[hs]d*/removable
-		do
-			if [[ $(< ${i}) = 1 ]]
-			then
-				removable=1
-			fi
-		done
-
-		# 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 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
+		#done
+		## 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
 
 	# check for special devices/clients:
 	# if a rangee and disk ist smaller then 256mb move partion one block further ahead
@@ -437,19 +438,20 @@
 
 setup_hdd_format()
 {
-	mke2fs -j -q ${ROOTHDD} || dialog_die
+	mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
 }
 
 install_mount_rootfs()
 {
 	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
 	install -d ${INSTALLROOT}/boot || dialog_die
-	cd ${INSTALLROOT} || dialog_die
 }
 
 install_system_image()
 {
+	pushd ${INSTALLROOT} > /dev/null
 	tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
+	popd > /dev/null
 }
 
 install_bootsector_chroot()
@@ -690,7 +692,6 @@
 
 install_umount_rootfs()
 {
-	cd /
 	umount ${INSTALLROOT}/boot || dialog_die
 	umount ${INSTALLROOT} || dialog_die
 }