--- trunk/mkinitrd-magellan/mkinitrd.in	2009/08/05 17:50:57	897
+++ trunk/mkinitrd-magellan/mkinitrd.in	2009/08/05 19:20:53	901
@@ -328,7 +328,13 @@
 	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}
 }
 
@@ -834,7 +840,6 @@
 
 add_initrd 'echo "-- Mounting sysroot ..."'
 add_initrd '. /etc/rootdev'
-add_initrd '[ ! -e ${device} ] && mknod ${device} b ${major} ${minor}'
 add_initrd 'echo "${device} /sysroot ${rootfs} defaults,ro 0 0" > /etc/fstab'
 add_initrd 'mount /sysroot || ash'
 
@@ -862,8 +867,6 @@
 # setup root block device
 [[ -z ${rootdev} ]] && die "no known rootdev found."
 echo "device='UUID=$(get_blkid ${rootdev})'" > ${DEST}/etc/rootdev || die
-echo "major=$(stat -c %t ${rootdev})" >> ${DEST}/etc/rootdev || die
-echo "minor=$(stat -c %T ${rootdev})" >> ${DEST}/etc/rootdev || die
 echo "rootfs='${rootfs}'" >> ${DEST}/etc/rootdev || die
 
 # install detected modules