--- trunk/installer-simple/bin/installer.sh.in	2015/07/31 10:55:16	2889
+++ trunk/installer-simple/bin/installer.sh.in	2015/07/31 11:11:58	2890
@@ -44,6 +44,7 @@
 VERSION="%VERSIONTAG%"
 TITLE="${DEFAULT_TITLE} - ${VERSION}"
 
+# initialize global variables so they are exportable
 # some sane defaults
 LIVEROOT="${DEFAULT_LIVEROOT}"
 IMAGEROOT="${DEFAULT_IMAGEROOT}"
@@ -56,6 +57,7 @@
 SPECIALDEVICE=""
 FORMFACTOR="${DEFAULT_FORMFACTOR}"
 FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
+FLASHDISK=0
 
 # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
 # -> now in images.conf
@@ -159,13 +161,15 @@
 	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
+		for i in /sys/block/[hs]d*/removable
+		do
+			if [[ $(< ${i}) = 1 ]]
+			then
+				removable=1
+				# we assume that all removable disks are flash disks on a zotac
+				export FLASHDISK=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
@@ -254,38 +258,103 @@
 		## delete disk
 		dd if=/dev/zero of=${HDD} count=1 &> /dev/null || dialog_die
 
-		if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
+		if [[ ${FLASHDISK} = 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
+			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. n= new disk
+				#10. p= primary disk
+				#11. 2= second partition
+				#12. ''= default sector start
+				#13. ''= defaul sector end
+				#14. w= write/quit
+				fdisk ${HDD} &> /dev/null << EOF
 n
 p
 1
 2
++50M
+a
+1
+n
+p
+2
+
 
+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. n= new disk
+				#10. p= primary disk
+				#11. 2= second partition
+				#12. ''= default sector start
+				#13. ''= defaul sector end
+				#14. w= write/quit
+				fdisk ${HDD} &> /dev/null << EOF
+n
+p
+1
+
++50M
 a
 1
+n
+p
+2
+
+
 w
 EOF
+			fi
 		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
+			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
+2
+
+a
+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
 n
 p
 1
@@ -295,6 +364,7 @@
 1
 w
 EOF
+			fi
 		fi
 	else
 		cfdisk ${HDD} || dialog_die
@@ -475,6 +545,11 @@
 	then
 		message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
 	fi
+	if [[ ${FLASHDISK} = 1 ]]
+	then
+		message+=$"\n\ZnFlash memory detected.\Zn"
+		message+=$"\n\ZnF2FS will be used as default filesystem withn the auto installation mode.\Zn"
+	fi
 
 	messagebox -y 12 -h $"Detected hardware:" "${message}"
 }
@@ -530,11 +605,20 @@
 
 	case "${method}" in
 		auto)
-			export BOOTHDD=""
-			export SWAPHDD=""
-			export ROOTHDD="${HDD}1"
-			export FORMAT_FILESYSTEM_BOOTHDD=""
-			export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
+			if [[ ${FLASHDISK} = 1 ]]
+			then
+				export BOOTHDD="${HDD}1"
+				export SWAPHDD=""
+				export ROOTHDD="${HDD}2"
+				export FORMAT_FILESYSTEM_BOOTHDD="f2fs"
+				export FORMAT_FILESYSTEM_ROOTHDD="ext2"
+			else
+				export BOOTHDD=""
+				export SWAPHDD=""
+				export ROOTHDD="${HDD}1"
+				export FORMAT_FILESYSTEM_BOOTHDD=""
+				export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
+			fi
 			export INSTALL_METHOD="${method}"
 			;;
 		normal)