From c3fbeed8234d660b713b9dcdb3cdb80e1e7ff804 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 31 May 2009 16:47:42 +0200 Subject: check if user is root --- package/cfgfs/src/fwcf.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'package/cfgfs') diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index ad75ee79e..c19e6240c 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -3,7 +3,7 @@ # Copyright (c) 2006, 2007 # Thorsten Glaser # Copyright (c) 2009 -# Waldemar Brodkorb +# Waldemar Brodkorb # # Provided that these terms and disclaimer and all copyright notices # are retained or reproduced in an accompanying document, permission @@ -44,7 +44,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 ]; + echo 'Exit. Configuration Filesystem Utility must be run as root.' + exit 1 +fi usage() { cat >&2 < Date: Sun, 31 May 2009 17:11:13 +0200 Subject: cfgfs fine tuning - fix typo in last commit - use a special partition with type id 88 for x86 based machines - try to automatically find backend storage device for cfgfs, either partition with type x86 or mtd device with name cfgfs --- package/cfgfs/src/fwcf.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'package/cfgfs') diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index c19e6240c..54503c55d 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -47,7 +47,7 @@ cd / what='Configuration Filesystem Utility (cfgfs), Version 1.06' who=$(id -u) -if [ $who -ne 0 ]; +if [ $who -ne 0 ]; then echo 'Exit. Configuration Filesystem Utility must be run as root.' exit 1 fi @@ -115,11 +115,10 @@ EOF exit 1 ;; esac -# find backend device -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 -- cgit v1.2.3 From b44b3799ca9fa6c744fc079b96a9c062e4bdd077 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 1 Jun 2009 22:16:31 +0200 Subject: remove unused $Id$ - $id$ substitution is not apropriate for git scm --- package/cfgfs/Makefile | 2 -- package/cfgfs/src/BSDmakefile | 16 +++++----------- package/cfgfs/src/LICENCE | 3 --- package/cfgfs/src/Makefile | 6 ------ package/cfgfs/src/Makefile.inc | 1 - package/cfgfs/src/fwcf.helper/Makefile | 1 - package/cfgfs/src/fwcf.sh | 2 -- package/cfgfs/src/lib/Makefile | 1 - package/cfgfs/src/mkfwcf/Makefile | 1 - package/cfgfs/src/tool/Makefile | 1 - package/cfgfs/src/unfwcf/Makefile | 1 - 11 files changed, 5 insertions(+), 30 deletions(-) (limited to 'package/cfgfs') 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 54503c55d..890dcf216 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -1,5 +1,4 @@ #!/bin/sh -#- # Copyright (c) 2006, 2007 # Thorsten Glaser # Copyright (c) 2009 @@ -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 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. -- cgit v1.2.3