SVN: geninitrd/trunk/functions

[glen]

Author: glen
Date: Sat Oct  6 00:47:27 2007
New Revision: 8791

Modified:
   geninitrd/trunk/functions
Log:
- library functions shouldn't exit

Modified: geninitrd/trunk/functions
==============================================================================
--- geninitrd/trunk/functions	(original)
+++ geninitrd/trunk/functions	Sat Oct  6 00:47:27 2007
@@ -58,7 +58,7 @@
 	case $rootdev in
 	/dev/dm-* | /dev/mapper/*)
 		local node
-		node=$(dm_lvm2_name "$rootdev") || exit
+		node=$(dm_lvm2_name "$rootdev") || return 1
 		if [ "$node" ]; then
 			rootdev="$node"
 		fi
@@ -80,7 +80,7 @@
 
 	# redirect output to tmpfile so we won't get subshell
 	local tmp ret
-	tmp=$(mktemp) || exit
+	tmp=$(mktemp) || return 1
 
 	/sbin/lvdisplay -c 2>/dev/null | awk -F: '{print $1}' > $tmp
 	while read dev; do