SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Wed Feb  7 11:58:24 2007
New Revision: 8237

Modified:
   geninitrd/trunk/geninitrd
Log:
- drop $orig_rootdev, as $rootdev is the same variable now

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Wed Feb  7 11:58:24 2007
@@ -993,9 +993,6 @@
 fi
 
 find_root
-
-org_rootdev="$rootdev"
-
 find_modules_for "$rootdev"
 
 findmodule "-$rootFs"
@@ -1327,7 +1324,7 @@
 		echo "umount /dev" >> "$s"
 		echo "umount /proc" >> "$s"
 	else
-		org_rootdev=$(_lvm2_node_resolve "$org_rootdev")
+		rootdev=$(_lvm2_node_resolve "$rootdev")
 		echo "cat /etc/lvm.conf > /tmp/lvm.conf" >> "$s"
 		echo "global {" > "$MNTIMAGE/etc/lvm.conf"
 		echo "	locking_type = 0" >> "$MNTIMAGE/etc/lvm.conf"
@@ -1367,7 +1364,7 @@
 		echo "\$printk" > /proc/sys/kernel/printk
 
 		# Find out major/minor
-		majmin="\$(LVM_SYSTEM_DIR=/tmp lvm lvdisplay --ignorelockingfailure -c $org_rootdev 2>/dev/null)"
+		majmin="\$(LVM_SYSTEM_DIR=/tmp lvm lvdisplay --ignorelockingfailure -c $rootdev 2>/dev/null)"
 		majmin="\${majmin#*/}"
 		majmin="\${majmin#*:*:*:*:*:*:*:*:*:*:*:*}"
 		major="\${majmin%:*}"
@@ -1435,7 +1432,7 @@
 
 if [ "$INITRDFS" = "initramfs" ]; then
 	mkdir -p $MNTIMAGE/newroot
-	[ ! -e "$MNTIMAGE/$org_rootdev" ] && cp -HR $org_rootdev $MNTIMAGE/dev
+	[ ! -e "$MNTIMAGE/$rootdev" ] && cp -HR $rootdev $MNTIMAGE/dev
 	# Parsing root parameter
 	# We support passing root as hda3 /dev/hda3 0303 0x0303 and 303
 	cat << 'EOF' >> "$s"