From 0f2f1ba8a6ce5a442ea1349761671bf3536ee531 Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Sat, 2 Mar 2019 13:48:25 +0530 Subject: [PATCH 1/2] fix: [regex] some sfdisks have no spaces --- shell_utils/basic_mount_image.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shell_utils/basic_mount_image.sh b/shell_utils/basic_mount_image.sh index 188dd55..4609e86 100755 --- a/shell_utils/basic_mount_image.sh +++ b/shell_utils/basic_mount_image.sh @@ -17,15 +17,15 @@ set -x # Double check the path and offsets as noted above! # Path to the image -IMAGE='2018-01-29_CIRCLean.img' +IMAGE='2018-11-13_CIRCLean.img' # Start sector of boot (first) partition -BOOT_START=`sfdisk -J ${IMAGE} | grep img1 | sed -n 's/.*"start": \([[:digit:]]*\).*/\1/p'` +BOOT_START=`sfdisk -J ${IMAGE} | grep img1 | sed -n 's/.*"start":*\([[:digit:]]*\).*/\1/p'` # Amount of sectors of boot (first) partition -BOOT_SIZE=`sfdisk -J ${IMAGE} | grep img1 | sed -n 's/.*"size": \([[:digit:]]*\).*/\1/p'` +BOOT_SIZE=`sfdisk -J ${IMAGE} | grep img1 | sed -n 's/.*"size":*\([[:digit:]]*\).*/\1/p'` # Start sector of root (second) partition -ROOT_START=`sfdisk -J ${IMAGE} | grep img2 | sed -n 's/.*"start": \([[:digit:]]*\).*/\1/p'` +ROOT_START=`sfdisk -J ${IMAGE} | grep img2 | sed -n 's/.*"start":*\([[:digit:]]*\).*/\1/p'` # Amount of sectors of root (second) partition -ROOT_SIZE=`sfdisk -J ${IMAGE} | grep img2 | sed -n 's/.*"size": \([[:digit:]]*\).*/\1/p'` +ROOT_SIZE=`sfdisk -J ${IMAGE} | grep img2 | sed -n 's/.*"size":*\([[:digit:]]*\).*/\1/p'` # Locations you'd like the partitions mounted BOOT_PATH='/mnt/rpi-boot' From 786b736d13df577c46ba430353a7f279dfbe3a0f Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Sat, 2 Mar 2019 13:54:42 +0530 Subject: [PATCH 2/2] chg: [doc] Make local config easier. Added qemu-user package for qemu-arm is in there --- doc/setup_with_proot.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/setup_with_proot.md b/doc/setup_with_proot.md index 4185465..a5f574a 100644 --- a/doc/setup_with_proot.md +++ b/doc/setup_with_proot.md @@ -28,7 +28,7 @@ Preparation ``` * Install qemu, qemu-user-static, and proot if not already installed: ``` - apt-get install qemu qemu-user-static proot + apt-get install qemu qemu-user-static qemu-user proot ``` Download the Raspbian image @@ -116,7 +116,10 @@ arrow keys move the cursor, spacebar selects/deselects a locale, tab moves the c to a different context, and enter lets you select "ok". This step might take some time, be patient: ``` - dpkg-reconfigure locales + sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen + sed -i -e 's/en_GB.UTF-8 UTF-8/# en_US.UTF-8 UTF-8/g' /etc/locale.gen + locale-gen en_US.UTF-8 + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 ``` * In the image, make sure everything is up-to-date and remove old packages. You may have to run dist-upgrade and autoremove several times for everything to be installed, and a few