SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Thu Oct  4 17:10:53 2007
New Revision: 8774

Modified:
   geninitrd/trunk/geninitrd
Log:
- use just tmpfs for dmraid
- globally umount tmpfs /dev if used (dmraid/lvm2 mixture possible)

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Thu Oct  4 17:10:53 2007
@@ -1175,7 +1175,6 @@
 		cat >> "$s" <<-'EOF'
 			killall udevd
 			umount /proc
-			umount /dev 2>/dev/null
 			umount /sys
 			EOF
 	fi
@@ -1187,10 +1186,9 @@
 		exit 1
 	fi
 
-	# AFAIR it just needs tmpfs on /dev.
-	if [ ! -x $MNTIMAGE/sbin/udevd ]; then
-		echo "Error: udev is needed on target initrd for dmraid to work!"
-		exit 1
+	# always make /dev on tmpfs
+	if ! is_yes "$tmpfs_dev"; then
+		initrd_gen_tmpfs_dev
 	fi
 
 	mkdir -p "$MNTIMAGE/sbin"
@@ -1335,7 +1333,6 @@
 		echo "lvm vgchange -T -a y $VGVOLUME" >> "$s"
 		echo "umount /tmp" >> "$s"
 		# fail to umount
-		echo "umount /dev 2>/dev/null" >> "$s"
 		echo "umount /proc" >> "$s"
 	else
 		echo "cat /etc/lvm.conf > /tmp/lvm.conf" >> "$s"
@@ -1383,7 +1380,6 @@
 		val=\$((256 * \$major + \$minor))
 		echo \$val > /proc/sys/kernel/real-root-dev
 		umount /tmp
-		umount /dev 2>/dev/null
 		umount /proc
 EOF
 	fi
@@ -1439,6 +1435,14 @@
 	initrd_gen_procdata
 fi
 
+# finally umount /dev finally if it was on tmpfs
+if is_yes "$tmpfs_dev"; then
+	cat <<-EOF >> "$s"
+	umount /dev
+EOF
+	tmpfs_dev=no
+fi
+
 # additional devs always needed
 [ ! -e "$MNTIMAGE/$rootdev_add" ] && inst $rootdev_add $MNTIMAGE/dev