[PATCH 2/2] Fix boot on locked XO-1

Bernie Innocenti bernie at codewiz.org
Sun Feb 14 23:01:17 EST 2010


We weren't passing "-t jffs2" to mount root on XO-1 when booting
in locked mode.
---
 30olpc-boot/olpc-boot-cmdline.sh |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/30olpc-boot/olpc-boot-cmdline.sh b/30olpc-boot/olpc-boot-cmdline.sh
index fc79d18..ca3f561 100644
--- a/30olpc-boot/olpc-boot-cmdline.sh
+++ b/30olpc-boot/olpc-boot-cmdline.sh
@@ -24,7 +24,11 @@ if [ -z "$root" ]; then
 			tmp=$((tmp - 1))
 			root="/dev/disk/mmc/mmc${tmp}p2"
 			;;
-		/pci/nandflash at c:*) root="/dev/mtdblock0" ;; # XO-1 internal NAND
+		/pci/nandflash at c:*)
+			# XO-1 internal NAND
+			root="/dev/mtdblock0"
+			fstype="jffs2"
+			;;
 		/pci/usb@*) root="/dev/sda2" ;; # external USB, assume partitioned
 	esac
 fi
-- 
1.6.2.5




More information about the Devel mailing list