--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2009/08/05 18:12:25	1180
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2009/08/05 19:30:37	1187
@@ -21,7 +21,7 @@
 ########################################
 
 ### System/Config Version
-VERSION="0.3.3"
+VERSION="0.3.4"
 TITLE="alxinstall-ng - ${VERSION}"
 
 CDPATH="/mnt/cdrom"
@@ -480,16 +480,23 @@
 	local dev="$1"
 	[[ -z ${dev} ]] && die "no dev given"
 
-	eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
+	# check if given device is already an UUID
+	if [[ ${dev/UUID=/}x != ${dev}x ]]
+	then
+		eval "${dev}"
+	else
+		eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
+	fi
 	echo ${UUID}
 }
 
 install_system_settings()
 {
 	# schreibe fstab
-	echo -e "$(get_blkid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
-	echo -e "$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
-	echo -e "$(get_blkid ${SWAPHDD})\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+	echo -e "UUID=$(get_blkid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+	echo -e "UUID=$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+	# not needed busybox loads all with swapon -a, even if not mentioned in fstab
+	#echo -e "UUID='$(get_blkid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
 	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
 
@@ -500,7 +507,7 @@
 install_system_settings_flash()
 {
 	# schreibe fstab
-	echo -e "$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
+	echo -e "UUID=$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
 	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
 }