Chromebook-setup Diff

chromebook-setup.diff

--- chromebook-setup.sh	2014-10-22 06:17:31.000000000 -0400
+++ ../tried/mali_chromebook-setup_002/chromebook-setup.sh	2014-11-16 21:11:27.229687137 -0500
@@ -11,7 +11,7 @@
 VBOOT_URL="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/"
 ROOTFS_DIR="$PWD/rootfs"
 MALI_DEFAULT="r4p1-00rel0"
-ROOT_DEFAULT="/dev/mmcblk1p2"
+ROOT_DEFAULT="/dev/mmcblk0p2"
 
 print_usage_exit()
 {
@@ -207,7 +207,7 @@
     }
 
     # Unmount any partitions automatically mounted
-    sudo umount "$CB_SETUP_STORAGE"? || echo -n
+    sudo umount "$CB_SETUP_STORAGE"p? || echo -n
 
     # Clear the partition table
     sudo sgdisk -o -g "$CB_SETUP_STORAGE"
@@ -223,7 +223,7 @@
 
     # Create and format the root partition
     sudo sgdisk -n 2:0:0 -t 2:7f01 "$CB_SETUP_STORAGE"
-    sudo mkfs.ext4 -L mali_root "$CB_SETUP_STORAGE"2
+    sudo mkfs.ext4 -L mali_root "$CB_SETUP_STORAGE"p2
 
     echo "Done."
 }
@@ -243,7 +243,7 @@
     }
 
     echo "Mounting rootfs partition in $ROOTFS_DIR"
-    part="$CB_SETUP_STORAGE"2
+    part="$CB_SETUP_STORAGE"p2
     mkdir -p "$ROOTFS_DIR"
     sudo umount "$ROOTFS_DIR" || echo -n
     sudo mount "$part" "$ROOTFS_DIR"
@@ -468,8 +468,9 @@
     make $(jopt)
 
     # Install it on the boot partition
-    echo "console=tty1 debug verbose root=$arg_root rootwait rw rootfstype=ext4" > boot_params
-    boot="$CB_SETUP_STORAGE"1
+    echo "echoing console=tty1 debug verbose root=/dev/mmcblk1p2 rootwait rw rootfstype=ext4 > boot_params"
+    echo "console=tty1 debug verbose root=/dev/mmcblk1p2 rootwait rw rootfstype=ext4" > boot_params
+    boot="$CB_SETUP_STORAGE"p1
     sudo ./build/utility/vbutil_kernel --pack "$boot" --keyblock tests/devkeys/kernel.keyblock --version 1 --signprivate tests/devkeys/kernel_data_key.vbprivk --config boot_params --vmlinuz ../kernel/kernel.itb --arch arm
 
     cd - > /dev/null
@@ -490,6 +491,7 @@
 
     echo "Ejecting storage device..."
     sync
+    sudo umount "$CB_SETUP_STORAGE"p?
     sudo eject "$CB_SETUP_STORAGE"
     echo "All done."
 }