From c88336352a56aec762934c12b41081b1b635a7cc Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Thu, 20 May 2004 09:10:23 +0000 Subject: [PATCH] Rene Rebe: first patchset to make ROCK Net more useable by addind error detections (such as diagnostics if the interface/profile combination was not know and so nothing done) fixed typos in ifup (useage -> usage ...) [2004051216163501246] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3027 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/sysfiles/ifup.sh | 6 +++--- package/base/sysfiles/rocknet.sh | 10 ++++++++++ package/base/sysfiles/rocknet_modules_base.sh | 6 ++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/package/base/sysfiles/ifup.sh b/package/base/sysfiles/ifup.sh index 7036507f2..c93545f19 100644 --- a/package/base/sysfiles/ifup.sh +++ b/package/base/sysfiles/ifup.sh @@ -1,11 +1,11 @@ #!/bin/sh -useage() { - echo "Useage: $0 interface [ profile ]" +usage() { + echo "Usage: $0 interface [ profile ]" exit 1 } -[ "$1" ] || useage +[ "$1" ] || usage if [ "$2" = "" ] ; then profile="`cat /etc/network/profile 2> /dev/null`" diff --git a/package/base/sysfiles/rocknet.sh b/package/base/sysfiles/rocknet.sh index 9f778ae1a..6b743154f 100755 --- a/package/base/sysfiles/rocknet.sh +++ b/package/base/sysfiles/rocknet.sh @@ -23,6 +23,9 @@ profile=$1 interface=$2 mode=$3 +pmatched=0 # some profile matched ? +imatched=0 # some interface matched ? + # # addcode mode major-priority minor-priority code1 # @@ -54,6 +57,10 @@ error() { echo "$*" } +status() { + echo "$*" +} + for x in "$rocknet_base"/modules/*.sh; do . "$x"; done while read cmd para @@ -81,3 +88,6 @@ done < <( done | sort ) +[ "$pmatched" = 0 ] && error "Unknown profile: $profile" +[ "$imatched" = 0 ] && error "Unknown interface for profile: $interface" + diff --git a/package/base/sysfiles/rocknet_modules_base.sh b/package/base/sysfiles/rocknet_modules_base.sh index 15b267a2c..870c63eec 100644 --- a/package/base/sysfiles/rocknet_modules_base.sh +++ b/package/base/sysfiles/rocknet_modules_base.sh @@ -30,6 +30,7 @@ public_interface() { for x in $prof; do [ "$x" = "$profile" ] && ignore=0 done + [ "$ignore" = 0 ] && pmatched=1 fi if [ "$ignore" = 0 ]; then @@ -42,5 +43,10 @@ public_interface() { [ "$if" = "$interface" ] || ignore=1 fi fi + + if [ "$ignore" = 0 ] ; then + imatched=1 + status "Interface / profile matched: $if($prof)" + fi }