Browse Source

cfgfs: add support for GPT on mmc devices

Waldemar Brodkorb 4 weeks ago
parent
commit
3bb2f83dcf
2 changed files with 10 additions and 5 deletions
  1. 1 1
      package/cfgfs/Makefile
  2. 9 4
      package/cfgfs/src/fwcf.sh

+ 1 - 1
package/cfgfs/Makefile

@@ -4,7 +4,7 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		cfgfs
-PKG_VERSION:=		1.0.11
+PKG_VERSION:=		1.0.12
 PKG_RELEASE:=		1
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base/adk

+ 9 - 4
package/cfgfs/src/fwcf.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (c) 2006-2007
 #	Thorsten Glaser <tg@mirbsd.de>
-# Copyright (c) 2009-2023
+# Copyright (c) 2009-2024
 #	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.11'
+what='Configuration Filesystem Utility (cfgfs), Version 1.12'
 
 who=$(id -u)
 if [ $who -ne 0 ]; then
@@ -142,9 +142,14 @@ 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 }')
+		partnum=$(gdisk -l $rootdisk 2>/dev/null|fgrep "cfgfs"|awk '{ print $1 }')
 		if [ ! -z $partnum ]; then
-			part=/dev/sda${partnum}
+			echo $rootdisk|grep mmcblk >/dev/null 2>&1
+			if [ $? -eq 0 ]; then
+				part=${rootdisk}p${partnum}
+			else
+				part=${rootdisk}${partnum}
+			fi
 		fi
 	fi
 	if [ -z $part ]; then