From b2ae8e3c7ba672368406ece861ae05a9051f4593 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Feb 2011 22:04:08 +0100 Subject: remove empty directories after origin /etc files are removed (workarounds a seldom segfault) --- package/cfgfs/Makefile | 2 +- package/cfgfs/src/fwcf.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'package/cfgfs') diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 2d824e1bb..57f394c0d 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.8 -PKG_RELEASE:= 5 +PKG_RELEASE:= 6 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 ddcbfcc50..b37da0bcd 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -257,7 +257,6 @@ if test $1 = commit; then cfgfs.helper -Z - /tmp/.cfgfs/status.asz cd /tmp/.cfgfs/root rm -f /tmp/.cfgfs/temp/.cfgfs_* /tmp/.cfgfs/temp/.rnd - find /tmp/.cfgfs/temp -type d -empty -delete find . -type f | while read f; do f=${f#./} if [[ ! -e /tmp/.cfgfs/temp/$f ]]; then @@ -269,6 +268,7 @@ if test $1 = commit; then y=$(cd ../temp; md5sum "$f" 2>/dev/null) [[ "$x" = "$y" ]] && rm "../temp/$f" done + find /tmp/.cfgfs/temp -type d -empty -delete rv=0 if [ $mtd -eq 1 ]; then if ! ( cfgfs.helper -M /tmp/.cfgfs/temp | eval $mtdtool -F write - cfgfs ); then -- cgit v1.2.3