--- /sbin/mkbootdisk.orig	Thu Feb  8 21:16:36 2001
+++ /sbin/mkbootdisk	Thu Feb  8 22:14:24 2001
@@ -16,6 +16,9 @@
 {
 	RETVAL=$?
 	trap '' EXIT
+	if [ "$RETVAL" != 0 ]; then 
+		echo 'Something odd happened while executing the script, exiting...'
+	fi
 	umount "$MOUNTDIR" &>/dev/null ||:
 	rm -rf "$MOUNTDIR"
 	exit $RETVAL
@@ -164,8 +167,8 @@
 	# whee, now we have to look through every partition looking for
 	# the thing called $rootlabel, which could be raid. Ick.
 
-	list=$(tail +3 /proc/partitions |awk '{ print $4 '} |grep '^md')
-	list="$list $(tail +3 /proc/partitions |awk '{ print $4 '} |grep -v '^md')"
+	list=$(tail +3 /proc/partitions |awk '{ print $4 }' |grep '^md' ||:)
+	list="$list $(tail +3 /proc/partitions |awk '{ print $4 }' |grep -v '^md' ||:)"
 	rootdev=
 	for dev in $list; do
 		if /sbin/tune2fs -l /dev/$dev &>/dev/null; then