SVN: geninitrd/trunk/geninitrd

[adamg]

Author: adamg
Date: Mon Jul  9 09:40:33 2007
New Revision: 8667

Modified:
   geninitrd/trunk/geninitrd
Log:
- Jacek Konieczny's geninitrd-lvm_initramfs.patch applied
  (http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2007-May/018983.html)


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Mon Jul  9 09:40:33 2007
@@ -1025,6 +1025,8 @@
 mknod "$MNTIMAGE/dev/console" c 5 1
 mknod "$MNTIMAGE/dev/null" c 1 3
 mknod "$MNTIMAGE/dev/zero" c 1 5
+mkdir "$MNTIMAGE/dev/pts"
+mkdir "$MNTIMAGE/dev/shm"
 
 s="$RCFILE"
 ln -s /linuxrc $MNTIMAGE/init
@@ -1097,6 +1099,10 @@
 }
 
 initrd_gen_tmpfs_dev() {
+    if [ "$INITRDFS" = "initramfs" ]; then
+		# initramfs is read-write filesystem, no need for tmpfs
+		return
+	fi
 	tmpfs_dev=yes
 
 	busybox_applet mount mknod mkdir
@@ -1147,7 +1153,7 @@
 		cat >> "$s" <<-'EOF'
 			killall udevd
 			umount /proc
-			umount /dev
+			umount /dev 2>/dev/null
 			umount /sys
 			EOF
 	fi
@@ -1307,7 +1313,7 @@
 		echo "lvm vgchange -T -a y $VGVOLUME" >> "$s"
 		echo "umount /tmp" >> "$s"
 		# fail to umount
-		echo "umount /dev" >> "$s"
+		echo "umount /dev 2>/dev/null" >> "$s"
 		echo "umount /proc" >> "$s"
 	else
 		echo "cat /etc/lvm.conf > /tmp/lvm.conf" >> "$s"
@@ -1338,7 +1344,7 @@
 		echo 0 > /proc/sys/kernel/printk
 
 		: 'Scanning for Volume Groups'
-		LVM_SYSTEM_DIR=/tmp lvm vgscan --ignorelockingfailure 2>/dev/null
+		LVM_SYSTEM_DIR=/tmp lvm vgscan --mknodes --ignorelockingfailure 2>/dev/null
 
 		: 'Activating Volume Groups'
 		LVM_SYSTEM_DIR=/tmp lvm vgchange --ignorelockingfailure -a y $VGVOLUME 2>/dev/null
@@ -1355,7 +1361,7 @@
 		val=\$((256 * \$major + \$minor))
 		echo \$val > /proc/sys/kernel/real-root-dev
 		umount /tmp
-		umount /dev
+		umount /dev 2>/dev/null
 		umount /proc
 EOF
 	fi