11 files changed, 17 insertions, 36 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 4ab5c6ea1..1485cb9d9 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
diff --git a/package/cfgfs/src/BSDmakefile b/package/cfgfs/src/BSDmakefile
index 4d3bf7a11..e10aa1dbc 100644
--- a/package/cfgfs/src/BSDmakefile
+++ b/package/cfgfs/src/BSDmakefile
@@ -1,14 +1,8 @@
-# $MirOS: contrib/hosted/fwcf/BSDmakefile,v 1.8 2007/03/13 18:14:30 tg Exp $
-#-
-# This file is part of the FreeWRT project. FreeWRT is copyrighted
-# material, please see the LICENCE file in the top-level directory
-# or at http://www.freewrt.org/licence for details.
-
-  SUBDIR+= lib
-  SUBDIR+= mkfwcf
-  SUBDIR+= unfwcf
-  SUBDIR+= tool
-  SUBDIR+= fwcf.helper
+SUBDIR+= lib
+SUBDIR+= mkfwcf
+SUBDIR+= unfwcf
+SUBDIR+= tool
+SUBDIR+= fwcf.helper
 
 test: _SUBDIRUSE
 
diff --git a/package/cfgfs/src/LICENCE b/package/cfgfs/src/LICENCE
index af7542c91..e8a901f83 100644
--- a/package/cfgfs/src/LICENCE
+++ b/package/cfgfs/src/LICENCE
@@ -30,6 +30,3 @@ c_lzo1x plug-in is covered by the GNU General Public License, Ver-
 sion 1 or higher. The files in the bundled/ subdirectory are not a
 part of FWCF and covered by their own licenced. The version 1.0 of
 FWCF bundles MiniLZO from lzo-2.02 under the GPL 2 or higher only.
-
-⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼
-$MirOS: contrib/hosted/fwcf/LICENCE,v 1.5 2007/03/13 18:31:07 tg Exp $
diff --git a/package/cfgfs/src/Makefile b/package/cfgfs/src/Makefile
index 7ab068c69..4f4b69ee2 100644
--- a/package/cfgfs/src/Makefile
+++ b/package/cfgfs/src/Makefile
@@ -1,9 +1,3 @@
-# $MirOS: contrib/hosted/fwcf/GNUmakefile,v 1.8 2007/03/09 23:09:34 tg Exp $
-#-
-# This file is part of the FreeWRT project. FreeWRT is copyrighted
-# material, please see the LICENCE file in the top-level directory
-# or at http://www.freewrt.org/licence for details.
-
 SRCS+=		tool.c
 SRCS+=		sys_linux.c
 SRCS+=		replace.c
diff --git a/package/cfgfs/src/Makefile.inc b/package/cfgfs/src/Makefile.inc
index 82f7eb8f9..4a9d6d687 100644
--- a/package/cfgfs/src/Makefile.inc
+++ b/package/cfgfs/src/Makefile.inc
@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/Makefile.inc,v 1.10 2007/05/08 21:52:53 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.
diff --git a/package/cfgfs/src/fwcf.helper/Makefile b/package/cfgfs/src/fwcf.helper/Makefile
index 882c0d486..93065fb7a 100644
--- a/package/cfgfs/src/fwcf.helper/Makefile
+++ b/package/cfgfs/src/fwcf.helper/Makefile
@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/fwcf.helper/Makefile,v 1.9 2007/03/13 18:14:31 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.
diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh
index ad75ee79e..890dcf216 100644
--- a/package/cfgfs/src/fwcf.sh
+++ b/package/cfgfs/src/fwcf.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
-#-
 # Copyright (c) 2006, 2007
 #	Thorsten Glaser <tg@mirbsd.de>
 # Copyright (c) 2009
-#	Waldemar Brodkorb <openadk@waldemar-brodkorb.de>
+#	Waldemar Brodkorb <wbx@openadk.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
 # are retained or reproduced in an accompanying document, permission
@@ -19,7 +18,6 @@
 # of dealing in the work, even if advised of the possibility of such
 # damage or existence of a defect, except proven that it results out
 # of said person's immediate fault when using the work as intended.
-#-
 # Possible return values:
 # 0 - everything ok
 # 1 - syntax error
@@ -44,7 +42,13 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 wd=$(pwd)
 cd /
-what='Configuration Filesystem (cfgfs), Version 1.06'
+what='Configuration Filesystem Utility (cfgfs), Version 1.06'
+
+who=$(id -u)
+if [ $who -ne 0 ]; then
+	echo 'Exit. Configuration Filesystem Utility must be run as root.'
+	exit 1
+fi
 
 usage() {
 	cat >&2 <<EOF
@@ -109,10 +113,10 @@ EOF
 	exit 1 ;;
 esac
 
-uname=$(uname -m)          
-if [[ "$uname" = "i586" ]];then                      
-        part=/dev/sda2                               
-else
+# find backend device, first try to find partition with ID 88
+part=$(fdisk -l|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
 fi
 
diff --git a/package/cfgfs/src/lib/Makefile b/package/cfgfs/src/lib/Makefile
index 85252b4cb..c23c605ac 100644
--- a/package/cfgfs/src/lib/Makefile
+++ b/package/cfgfs/src/lib/Makefile
@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/lib/Makefile,v 1.5 2007/03/13 18:14:31 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.
diff --git a/package/cfgfs/src/mkfwcf/Makefile b/package/cfgfs/src/mkfwcf/Makefile
index 35eed0cba..2d6ebce6b 100644
--- a/package/cfgfs/src/mkfwcf/Makefile
+++ b/package/cfgfs/src/mkfwcf/Makefile
@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/mkfwcf/Makefile,v 1.14 2006/09/26 10:25:06 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.
diff --git a/package/cfgfs/src/tool/Makefile b/package/cfgfs/src/tool/Makefile
index 8ffa054a2..48e446541 100644
--- a/package/cfgfs/src/tool/Makefile
+++ b/package/cfgfs/src/tool/Makefile
@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/tool/Makefile,v 1.5 2007/02/28 22:59:38 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.
diff --git a/package/cfgfs/src/unfwcf/Makefile b/package/cfgfs/src/unfwcf/Makefile
index 678482ad4..79788eb70 100644
--- a/package/cfgfs/src/unfwcf/Makefile
+++ b/package/cfgfs/src/unfwcf/Makefile
@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/unfwcf/Makefile,v 1.14 2006/09/26 10:25:06 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.