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

2010-02-14 Thread Bernie Innocenti
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/nandfl...@c:*) root=/dev/mtdblock0 ;; # XO-1 internal 
NAND
+   /pci/nandfl...@c:*)
+   # XO-1 internal NAND
+   root=/dev/mtdblock0
+   fstype=jffs2
+   ;;
/pci/u...@*) root=/dev/sda2 ;; # external USB, assume 
partitioned
esac
 fi
-- 
1.6.2.5

___
Devel mailing list
Devel@lists.laptop.org
http://lists.laptop.org/listinfo/devel


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

2010-02-14 Thread Bernie Innocenti
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/nandfl...@c:*) root=/dev/mtdblock0 ;; # XO-1 internal 
NAND
+   /pci/nandfl...@c:*)
+   # XO-1 internal NAND
+   root=/dev/mtdblock0
+   fstype=jffs2
+   ;;
/pci/u...@*) root=/dev/sda2 ;; # external USB, assume 
partitioned
esac
 fi
-- 
1.6.2.5


-- 
   // Bernie Innocenti - http://codewiz.org/
 \X/  Sugar Labs   - http://sugarlabs.org/

___
Devel mailing list
Devel@lists.laptop.org
http://lists.laptop.org/listinfo/devel


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

2010-02-12 Thread Bernie Innocenti
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/nandfl...@c:*) root=/dev/mtdblock0 ;; # XO-1 internal 
NAND
+   /pci/nandfl...@c:*)
+   # XO-1 internal NAND
+   root=/dev/mtdblock0
+   fstype=jffs2
+   ;;
/pci/u...@*) root=/dev/sda2 ;; # external USB, assume 
partitioned
esac
 fi
-- 
1.6.2.5

___
Devel mailing list
Devel@lists.laptop.org
http://lists.laptop.org/listinfo/devel


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

2010-02-12 Thread Bernie Innocenti
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/nandfl...@c:*) root=/dev/mtdblock0 ;; # XO-1 internal 
NAND
+   /pci/nandfl...@c:*)
+   # XO-1 internal NAND
+   root=/dev/mtdblock0
+   fstype=jffs2
+   ;;
/pci/u...@*) root=/dev/sda2 ;; # external USB, assume 
partitioned
esac
 fi
-- 
1.6.2.5

___
Devel mailing list
Devel@lists.laptop.org
http://lists.laptop.org/listinfo/devel