Author: arekm
Date: Thu Feb 17 23:16:30 2011
New Revision: 12159
Modified:
geninitrd/trunk/geninitrd
Log:
root dev finding: fallback to calculating based on initrd /dev file
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Thu Feb 17 23:16:30 2011
@@ -700,9 +700,14 @@
initrd_gen_setrootdev() {
debug "Adding rootfs finding based on kernel cmdline root= option
support."
+ busybox_applet ls
add_linuxrc <<-'EOF'
if [ "${ROOT##/dev/}" != "${ROOT}" ]; then
rootnr="$(busybox awk -v rootnode="${ROOT##/dev/}" '$4
== rootnode { print 256 * $1 + $2 }' /proc/partitions)"
+ # fallback to ls
+ if [ -z "$rootnr" ]; then
+ rootnr="$(busybox ls -lL ${ROOT} | awk '{if
(/^b/) { print 256 * $3 + $4; }}')"
+ fi
if [ -n "$rootnr" ]; then
echo "$rootnr" > /proc/sys/kernel/real-root-dev
fi
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
