olsrd: init: cosmetics: always include to name of the script in logoutput

[lede-routing/.git] / olsrd / files / olsrd.init

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index 7282bfee586cf54cfce5c7c6538e8f91118ecd35..7ffe33c12a476cc06e461b6a385ced7eaeb88a7c 100644 (file)
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -20,9 +20,12 @@ T='  '
 N='
 '
 
-log()
-{
-       logger -t olsrd -p daemon.info -s "$1"
+log() {
+       logger -t olsrd -p daemon.info -s "${initscript}: $@"
+}
+
+error() {
+       log "ERROR: $@"
 }
 
 validate_varname() {
@@ -737,10 +740,6 @@ olsrd_setup_smartgw_rules() {
        fi
 }
 
-error() {
-       log "error() ${initscript}: $@"
-}
-
 start() {
        SYSTEM_HOSTNAME=
        SYSTEM_LAT=
@@ -817,8 +816,12 @@ start() {
                        return 1
                else
                        service_start /usr/sbin/olsrd -f "$OLSRD_CONFIG_FILE" -nofork
+                       service_check /usr/sbin/olsrd || {
+                               log "startup-error: check via: '/usr/sbin/olsrd -f \"$OLSRD_CONFIG_FILE\" -nofork'"
+                       }
                fi
        fi
+
        olsrd_setup_smartgw_rules
 }