fix rootfs detection

[openwrt.git] / target / linux / rb532-2.6 / base-files / sbin / cf2nand

diff --git a/target/linux/rb532-2.6/base-files/sbin/cf2nand b/target/linux/rb532-2.6/base-files/sbin/cf2nand
index f8576be..169f7eb 100755 (executable)
--- a/target/linux/rb532-2.6/base-files/sbin/cf2nand
+++ b/target/linux/rb532-2.6/base-files/sbin/cf2nand
@@ -6,16 +6,11 @@ copy_kernel() {
        local output="$2"
        local cmdline="$3"
        size="$(echo -n "$cmdline" | wc -c)"
-       dd if="$input" bs=3M count=1 | (
-               dd bs=4112 count=1
-               echo -n "$cmdline"
-               dd if=/dev/zero bs="$((512 - $size))" count=1
-               dd bs=512 count=1 of=/dev/null
-               cat
-       ) > "$output"
+       dd if="$input" bs=3M count=1 > "$output"
+       /sbin/patch-cmdline "$output" "$cmdline"
 }
 
-fstype="$(mount | grep ' / ' | awk '{print $5}')"
+fstype="$(mount | grep ' / ' | awk '$1 != "rootfs" {print $5}')"
 case "$fstype" in
        ext2|jffs2) echo "Copying from $fstype to yaffs2";;
        *) echo "Invalid filesystem."; exit 1;;