SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Tue Nov 27 18:12:08 2007
New Revision: 9110

Modified:
   geninitrd/trunk/geninitrd
Log:
- seems like /proc is mounted with initramfs 2.6.22.14 kernel (could someone clarify this with lkml or other link?)

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Tue Nov 27 18:12:08 2007
@@ -159,7 +159,13 @@
 	fi
 
 	proc_mounted=yes
-	echo "mount -t proc none /proc" | add_linuxrc
+    if [ "$INITRDFS" = "initramfs" ]; then
+		# /proc is mounted with initramfs 2.6.22.14 kernel
+		# XXX: remove when it is clear why proc was already mounted
+		echo "[ -f /proc/cmdline ] || mount -t proc none /proc" | add_linuxrc
+	else
+		echo "mount -t proc none /proc" | add_linuxrc
+	fi
 }
 
 # generate code to mount /sys on initrd