summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Eble <psychotrahe@users.sourceforge.net>2007-05-27 14:49:54 (GMT)
committerMatthias Eble <psychotrahe@users.sourceforge.net>2007-05-27 14:49:54 (GMT)
commit1baf11d3af00e35a1540003232abd80ec92f4af0 (patch)
tree13593044d94a9cb7ba2b2ae6f1b1a74bafb16deb
parentbf9f0e9f8901f0e9e960e367941d2ab53435f641 (diff)
downloadmonitoring-plugins-1baf11d3af00e35a1540003232abd80ec92f4af0.tar.gz
check_oracle does not need a valid ORACLE_HOME if called with --db. Thanks to Jason Martin (#1505551)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1719 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--THANKS.in1
-rwxr-xr-xplugins-scripts/check_oracle.sh8
2 files changed, 6 insertions, 3 deletions
diff --git a/THANKS.in b/THANKS.in
index b35c438..5db3847 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -220,3 +220,4 @@ Matthias Flacke
220Emil Michles 220Emil Michles
221Ask Bjoern Hansen 221Ask Bjoern Hansen
222Enrico Scholz 222Enrico Scholz
223Jason Martin
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index 02ca111..56962e3 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -118,9 +118,11 @@ fi
118# Last resort 118# Last resort
119[ -z "$ORACLE_HOME" -a -d $PROGPATH/oracle ] && ORACLE_HOME=$PROGPATH/oracle 119[ -z "$ORACLE_HOME" -a -d $PROGPATH/oracle ] && ORACLE_HOME=$PROGPATH/oracle
120 120
121if [ -z "$ORACLE_HOME" -o ! -d "$ORACLE_HOME" ] ; then 121if [ "$cmd" != "--db" ]; then
122 echo "Cannot determine ORACLE_HOME for sid $2" 122 if [ -z "$ORACLE_HOME" -o ! -d "$ORACLE_HOME" ] ; then
123 exit $STATE_UNKNOWN 123 echo "Cannot determine ORACLE_HOME for sid $2"
124 exit $STATE_UNKNOWN
125 fi
124fi 126fi
125PATH=$PATH:$ORACLE_HOME/bin 127PATH=$PATH:$ORACLE_HOME/bin
126LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib 128LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib