Ver código fonte

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.
Waldemar Brodkorb 13 anos atrás
pai
commit
b8d0d2ff18

+ 4 - 4
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@

+ 3 - 2
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

+ 0 - 0
target/x86/files/etc/notmpfs


+ 1 - 0
target/x86/files/etc/tmpfs

@@ -0,0 +1 @@
+16384

+ 0 - 0
target/x86_64/files/etc/notmpfs


+ 1 - 0
target/x86_64/files/etc/tmpfs

@@ -0,0 +1 @@
+16384