diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2023-02-09 15:38:24 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2023-02-09 15:38:24 +0100 |
| commit | 9a9f72a7d66f29e988d0bbe207d53e2961f6df5f (patch) | |
| tree | 2854b7b602da10ca723bcd83f736db9104b1f60a /package/cfgfs | |
| parent | a255f372e4f04283bd7dd9b12582ee4b4a268f84 (diff) | |
cfgfs: search for GPT partition as fallback
Diffstat (limited to 'package/cfgfs')
| -rw-r--r-- | package/cfgfs/Makefile | 4 | ||||
| -rw-r--r-- | package/cfgfs/src/fwcf.sh | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index addec9a7f..9fa6e571f 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -4,8 +4,8 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cfgfs -PKG_VERSION:= 1.0.10 -PKG_RELEASE:= 4 +PKG_VERSION:= 1.0.11 +PKG_RELEASE:= 1 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base/adk PKG_URL:= http://www.openadk.org/ 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 <tg@mirbsd.de> -# Copyright (c) 2009-2017 +# Copyright (c) 2009-2023 # Waldemar Brodkorb <wbx@openadk.org> # # 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 |