X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=sbin%2Fgrml-router;h=ec3716854dc754164b15fb3a16fcc2e97f86a58a;hb=80d07bb5f7b87a990da936f1c3857991187fd709;hp=c7c0e167569c151e099283969d6290926adddef1;hpb=a83e3825511532c96dd400447f2e0cc5e89600dd;p=grml-network.git

diff --git a/sbin/grml-router b/sbin/grml-router
index c7c0e16..ec37168 100755
--- a/sbin/grml-router
+++ b/sbin/grml-router
@@ -1,24 +1,17 @@
 #!/bin/sh
 # Filename:      grml-router
 # Purpose:       set up your box as NAT-router
-# Authors:       grml-team (grml.org), Ulrich Dangel <schula@grml.org>, Michael Prokop <mika@grml.org>
+# Authors:       grml-team (grml.org), Ulrich Dangel <mru@grml.org>, Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Okt 07 23:18:38 CEST 2006 [mika]
 ################################################################################
 
-# exit on any error
-set -e
-
 CONFIG_FILE=/etc/grml/routersetup
 . /etc/grml/lsb-functions
 . /etc/grml/net-functions
 . /etc/grml/script-functions
 
-if [ $UID != 0 ]; then
-   eerror "Error: become root before starting $0"
-   exit 100
-fi
+check4root || exit 1
 
 if ! [ -r $CONFIG_FILE ] ; then
   eerror "$CONFIG_FILE could not be read."
@@ -28,13 +21,19 @@ fi
 . $CONFIG_FILE
 
 if [ -z "$OUTDEV" ] ; then
-    eerror "Outgouing device is not set in $CONFIG_FILE"
-    exit 1
+    eewarn "Outgoing device is not set in $CONFIG_FILE"
+    eewarn "Setting Outgoing device to auto"
+    OUTDEV=auto
 fi
 
 case "$OUTDEV" in
     auto|default)
     OUTDEV=$(defaultGWDev)
+    if [ -z "$OUTDEV" ] ; then
+	    eerror "The outgoing device could not be determined."
+	    eerror "Please adjust OUTDEV in $CONFIG_FILE"
+	    exit 1
+    fi
     ;;
 esac