X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=sh-lib;h=85d3c567009d11c1453b76734c3fd15fc275a442;hb=d3e3bc71f1950d3567883844c6f0f715fcbbfff6;hp=84d45e0e1bd977f873394126119e6bd49d6a444f;hpb=b7ee366085c5dff586bd8482944d079fa047cbcd;p=grml-shlib.git

diff --git a/sh-lib b/sh-lib
index 84d45e0..85d3c56 100644
--- a/sh-lib
+++ b/sh-lib
@@ -177,6 +177,10 @@ function warnLog
 #
 ###
 
+##
+# ATTENTION... THIS FUNCTINOS IS A BIG SECURITY HOLE
+# this function will be changed in future release
+##
 # i don't want to write exit status controle stuff every time
 function execute
 {
@@ -186,6 +190,7 @@ function execute
 
   local ret_=''
 
+  # NOT A GOOD IDEA
   eval "$to_exec_"
   ret_=$?
 
@@ -246,7 +251,7 @@ function isNotExistent
 
   if [ -e "$file_to_test_" ]; then
     if [ -z "$message_" ]; then
-      $error_function_ "file does allready exist \"$file_to_test_\"" 67
+      $error_function_ "file does already exist \"$file_to_test_\"" 67
     else
       $error_function_ "$message_"
     fi
@@ -306,6 +311,16 @@ function checkRoot
   checkId 0 "$1" "$2"
 }
 
+function isGrml
+{
+  if [ -f /etc/grml_version ] ; then 
+    dprint "isGrml(): this seems to be a grml system"
+    return 0                       
+  else                               
+    dprint "isGrml(): this is not a grml system"
+    return 1                       
+  fi                                 
+}
 
 function runsFromHd
 {
@@ -545,7 +560,7 @@ function netGetNameservers
   fi
   
   setCLang
-  ns_=`awk '/^nameserver/{printf "%s ",$2}' $file_`
+  ns_=`awk '/^nameserver/{printf "%s ",$2}' $file_ |xargs echo`
   restoreLang
   if [ -z "$ns_" ]; then
     if [ -z "$message_" ]; then
@@ -608,9 +623,10 @@ function _touchService
 
 function _createServiceFunctions
 {
-  for i in "start" "stop" "restart" "reload" "force-reload"; do
+  for i in "start" "stop" "restart" "reload"; do
     eval "function ${i}Service { _touchService ${i} \"\$1\" \"\$2\" \"\$3\"; }"
   done
+  eval "function forceReloadService { _touchService force-reload \"\$1\" \"\$2\" \"\$3\"; }"
 }
 _createServiceFunctions
 # }}}
@@ -703,7 +719,7 @@ function _setDebugLevel
   local debug_="${DEBUG:-0}"
   VERBOSE__="$debug_"
 }
-_checkBootParam
+_setDebugLevel
 # }}}
 
 # END OF FILE