diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-20 21:46:47 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-20 21:46:47 +0200 |
| commit | 5114e1d4b60bc14c851c8546bef5d669505ec53a (patch) | |
| tree | b7994afe0ca7e8db6c5dba20aafe961dec966fcc /package/cfgfs | |
| parent | 5b142635a68d74d23b7a3841d8eb6bc66c597e45 (diff) | |
| parent | 794a4a75d2e2c513e55b8962ad9e8e470dd82ba8 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cfgfs')
| -rw-r--r-- | package/cfgfs/Makefile | 4 | ||||
| -rw-r--r-- | package/cfgfs/src/fwcf.sh | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 6fa32318e..7dd161802 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -4,8 +4,8 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs -PKG_VERSION:= 1.0.8 -PKG_RELEASE:= 7 +PKG_VERSION:= 1.0.9 +PKG_RELEASE:= 1 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base PKG_URL:= http://openadk.org/ diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index 0fac5ec1f..8fec0422d 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (c) 2006, 2007 # Thorsten Glaser <tg@mirbsd.de> -# Copyright (c) 2009, 2010 +# Copyright (c) 2009, 2010, 2011 # Waldemar Brodkorb <wbx@openadk.org> # # Provided that these terms and disclaimer and all copyright notices @@ -42,7 +42,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin wd=$(pwd) cd / -what='Configuration Filesystem Utility (cfgfs), Version 1.08' +what='Configuration Filesystem Utility (cfgfs), Version 1.09' who=$(id -u) if [ $who -ne 0 ]; then @@ -114,7 +114,6 @@ EOF esac mtd=0 - if [ -x /sbin/nand ];then mtdtool=/sbin/nand fi @@ -129,6 +128,9 @@ rootdisk=$(readlink /dev/root) rootdisk=${rootdisk%p*} rootdisk=${rootdisk%[1-9]} part=$(fdisk -l /dev/$rootdisk 2>/dev/null|awk '$5 == 88 { 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 '$5 == 88 { print $1 }') |