diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-22 14:29:38 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-22 14:29:38 +0100 |
| commit | b8d0d2ff18de3f4de66e89a302cb277328f58433 (patch) | |
| tree | 90a2669c30f3efaec4de24555050d81c333f4bc7 /package/cfgfs | |
| parent | a96029501d215f16535ab3a879ac384e042c7df1 (diff) | |
enable cfgfs for x86/x86_64 targets
fix a bug, where the wrong cfgfs partition was used, when
more than one cfgfs partition is available. Always use
the cfgfs partition from the block device, the system is
booted.
Diffstat (limited to 'package/cfgfs')
| -rw-r--r-- | package/cfgfs/Makefile | 8 | ||||
| -rw-r--r-- | package/cfgfs/src/fwcf.sh | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 77ec839e3..70eb75a1f 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs -PKG_VERSION:= 1.0.7 -PKG_RELEASE:= 3 +PKG_VERSION:= 1.0.8 +PKG_RELEASE:= 1 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base -PKG_URL:= http://www.openadk.org/ +PKG_URL:= http://openadk.org/ -PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 foxg20 routerboard +PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 foxg20 routerboard x86 x86_64 PKG_CFLINE_CFGFS:= select BUSYBOX_COMM@ PKG_CFLINE_CFGFS+= select BUSYBOX_MD5SUM@ diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index 6c1cce7ec..ae2886d79 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -42,7 +42,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin wd=$(pwd) cd / -what='Configuration Filesystem Utility (cfgfs), Version 1.07' +what='Configuration Filesystem Utility (cfgfs), Version 1.08' who=$(id -u) if [ $who -ne 0 ]; then @@ -124,7 +124,8 @@ if [ -x /sbin/mtd ];then fi # find backend device, first try to find partition with ID 88 -part=$(fdisk -l|awk '$5 == 88 { print $1 }') +rootdisk=$(readlink /dev/root) +part=$(fdisk -l /dev/${rootdisk%1}|awk '$5 == 88 { 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 |