--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2010/10/18 11:46:02	1574
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2011/06/15 08:47:04	2387
@@ -21,7 +21,7 @@
 ########################################
 
 ### System/Config Version
-VERSION="0.3.5"
+VERSION="0.3.6"
 TITLE="alxinstall-ng - ${VERSION}"
 
 CDPATH="/mnt/cdrom"
@@ -37,6 +37,9 @@
 # default specialdevices
 SPECIALDEVICE=""
 
+# target filesystem
+FORMAT_FILESYSTEM="ext4"
+
 #################################################
 #		  DIALOG BOXEN			#
 #################################################
@@ -120,10 +123,13 @@
 	--cancel-label "Abbrechen" \
 	--ok-label "Weiter" \
 	--stdout \
+	--colors \
 	--menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
-	"1" "Automatisches Setup" \
-	"2" "Normale IDE-Disk (manuell)" \
-	"3" "Flash-Speicher (manuell)")
+	"1" "Automatisches Setup (Empfohlen)" \
+	"" "" \
+	"" "\Z1Experten Modi:\Zn" \
+	"2" "Normale IDE-Disk (Manuell)" \
+	"3" "Flash-Speicher (Manuell)")
 	RES=$?
 	[[ ${RES} -eq 1 ]] && return 1
 	if [[ ${RES} -eq 0 ]]
@@ -132,6 +138,7 @@
 			"1") run_install_auto ;;
         		"2") run_install_normal ;;
 			"3") run_install_flash ;;
+			"") dialog_setup_system_menu;;
 		esac
 	fi
 }
@@ -621,7 +628,7 @@
 	is_initrd_supported || return 0
 
 	cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
-echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx sd_mod ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via sata_via sata_sis sata_nv\"" > /etc/conf.d/mkinitrd
+echo "MODULES=\"${FORMAT_FILESYSTEM} amd74xx piix sis5513 via82cxxx sd_mod ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via sata_via sata_sis sata_nv\"" > /etc/conf.d/mkinitrd
 mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
 exit 0
 CHROOTEOF
@@ -675,11 +682,11 @@
 	# schreibe fstab
 	if is_uuid_supported
 	then
-		echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
-		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+		echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
 	else
-		echo -e "${BOOTHDD}\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
-		echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+		echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
 	fi
 	# not needed busybox loads all with swapon -a, even if not mentioned in fstab
 	#echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
@@ -695,9 +702,9 @@
 	# schreibe fstab
 	if is_uuid_supported
 	then
-		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
+		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
 	else
-		echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
+		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
 	fi
 	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
 	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die