Browse Source

cfgfs: make partition detection working with util-linux and busybox fdisk

Waldemar Brodkorb 7 years ago
parent
commit
c28d779196
2 changed files with 4 additions and 4 deletions
  1. 2 1
      package/cfgfs/Makefile
  2. 2 3
      package/cfgfs/src/fwcf.sh

+ 2 - 1
package/cfgfs/Makefile

@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		cfgfs
 PKG_VERSION:=		1.0.10
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base/apps
 PKG_URL:=		http://openadk.org/
@@ -14,6 +14,7 @@ PKG_CFLINE_CFGFS:=	select BUSYBOX_COMM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_DIFF@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_MD5SUM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_XARGS@
+PKG_CFLINE_CFGFS+=	select BUSYBOX_RDEV@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_SORT@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_FEATURE_SORT_BIG@
 PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS && !ADK_TARGET_ROOTFS_INITRAMFSARCHIVE && !ADK_TARGET_ROOTFS_JFFS2 && !ADK_TARGET_ROOTFS_SQUASHFS && !ADK_TARGET_ROOTFS_ISO

+ 2 - 3
package/cfgfs/src/fwcf.sh

@@ -132,13 +132,12 @@ echo $rootdisk|grep mmcblk >/dev/null 2>&1
 if [ $? -ne 0 ]; then
   rootdisk=${rootdisk%[1-9]}
 fi
-part=$(fdisk -l $rootdisk 2>/dev/null|awk '$8 == 88 { print $1 }')
+part=$(fdisk -l $rootdisk 2>/dev/null|grep '^/dev'|tail -1|awk '{ print $1 }')
 if [ -f .cfgfs ]; then
   . /.cfgfs
 fi
 if [ -z $part ]; then
-	# fallback to /dev/sda in case of encrypted root
-	part=$(fdisk -l /dev/sda 2>/dev/null|awk '$8 == 88 { print $1 }')
+	part=$(fdisk -l /dev/sda 2>/dev/null|grep '^/dev'|tail -1|awk '{ print $1 }')
 	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