From 6afea827d75ad7755cd8a817ce6f3606d94df950 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 7 Sep 2016 17:07:35 +0200 Subject: cfgfs: fix a problem when device use mmcblk1 as primary block device --- package/cfgfs/Makefile | 2 +- package/cfgfs/src/fwcf.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'package/cfgfs') diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 68ef295d5..b4e83f555 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.10 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base/apps PKG_URL:= http://openadk.org/ diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index 8fec0422d..aa5fcdb0f 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -126,7 +126,11 @@ fi rootdisk=$(readlink /dev/root) # strip partitions (f.e. mmcblk0p2, sda2, ..) rootdisk=${rootdisk%p*} -rootdisk=${rootdisk%[1-9]} +# do not cut 1-9 from mmcblk device names +echo $rootdisk|grep mmcblk >/dev/null 2>&1 +if [ $? -ne 0 ]; then + rootdisk=${rootdisk%[1-9]} +fi part=$(fdisk -l /dev/$rootdisk 2>/dev/null|awk '$5 == 88 { print $1 }') if [ -f .cfgfs ];then . /.cfgfs -- cgit v1.2.3