From 9a9f72a7d66f29e988d0bbe207d53e2961f6df5f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 9 Feb 2023 15:38:24 +0100 Subject: cfgfs: search for GPT partition as fallback --- package/cfgfs/src/fwcf.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'package/cfgfs/src/fwcf.sh') diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index 0d572595a..70d0fa5c0 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (c) 2006-2007 # Thorsten Glaser -# Copyright (c) 2009-2017 +# Copyright (c) 2009-2023 # Waldemar Brodkorb # # Provided that these terms and disclaimer and all copyright notices @@ -43,7 +43,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin wd=$(pwd) cd / -what='Configuration Filesystem Utility (cfgfs), Version 1.10' +what='Configuration Filesystem Utility (cfgfs), Version 1.11' who=$(id -u) if [ $who -ne 0 ]; then @@ -140,6 +140,13 @@ if [ -f .cfgfs ]; then fi if [ -z $part ]; then part=$(fdisk -l /dev/sda 2>/dev/null|awk '{if ($2=="*") { print $1" "$9} else {print $1" "$8}}'|grep '^/dev.*88.*'|tail -1|awk '{ print $1 }') + # find GPT partition + if [ -z $part ]; then + partnum=$(gdisk -l /dev/sda 2>/dev/null|fgrep "cfgfs"|awk '{ print $1 }') + if [ ! -z $partnum ]; then + part=/dev/sda${partnum} + fi + fi if [ -z $part ]; then # otherwise search for MTD device with name cfgfs part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd\([^:]*\):.*$/\1/')ro -- cgit v1.2.3