From ae33bebb4b19dbfb45df4be864efe503990dc0c8 Mon Sep 17 00:00:00 2001
From: Michel Stempin <michel.stempin@wanadoo.fr>
Date: Thu, 15 Oct 2020 23:12:07 +0200
Subject: [PATCH] adjust first_boot script to GPT partition layout

Signed-off-by: Michel Stempin <michel.stempin@wanadoo.fr>
---
 .../rootfs-overlay/usr/local/sbin/first_boot   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot
index 760dede..b7ea00e 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot
@@ -3,10 +3,15 @@
 # Uncomment the following line to get debug info
 #set -x
 
-SELF=$(basename $0)
-
 source /usr/local/lib/utils
 
+SELF=$(basename $0)
+root_part=$(cat /proc/cmdline | sed -n 's|^.*root=/dev/\([^ ]*\).*|\1|p')
+part_num=${root_part#mmcblk0p}
+if [ "${part_num}" -eq 1 ]; then
+    die 0 "recovery mode"
+fi
+
 notif () {
     info "$@"
     printf "$@" > /sys/class/graphics/fb0/notification
@@ -27,8 +32,6 @@ check_root_id () {
 }
 
 resize_rootfs_partition () {
-    local root_part=$(cat /proc/cmdline | sed -n 's|^.*root=/dev/\([^ ]*\).*|\1|p')
-    local part_num=${root_part#mmcblk0p}
     if [ "${part_num}" = "{$root_part}" ]; then
 	die 2 "${root_part} is not an SD card. Don't know how to expand it, aborting"
     fi
@@ -50,7 +53,6 @@ resize_rootfs_partition () {
 d
 ${part_num}
 n
-p
 ${part_num}
 ${part_start}
 +1G
@@ -69,7 +71,6 @@ reload_partition_table () {
 }
 
 resize_rootfs_filesystem () {
-    local root_part=$(cat /proc/cmdline | sed -n 's|^.*root=/dev/\([^ ]*\).*|\1|p')
     resize2fs /dev/${root_part} >/dev/null 2>&1 || die 7 "cannot resize the root filesystem, aborting"
     return 0
 }
@@ -106,8 +107,6 @@ create_backing_store_partition () {
     if [ $? -ne 0 ]; then
 
 	# Find out the root partition number from kernel command line
-	local root_part=$(cat /proc/cmdline | sed -n 's|^.*root=/dev/\([^ ]*\).*|\1|p')
-	local part_num=${root_part#mmcblk0p}
 	if [ "$part_num" = "$root_part" ]; then
 	    die 5 "$root_part is not an SD card. Don't know how to create the backing store partition"
 	fi
@@ -130,13 +129,12 @@ create_backing_store_partition () {
 	# Create a third FAT32 partition that filsl the disk
 	fdisk /dev/mmcblk0 >/dev/null 2>&1 <<EOF
 n
-p
 3
 
 
 t
 3
-c
+11
 w
 EOF
 	sync