From 499461c7335b5c53413915556e05d90798eacf67 Mon Sep 17 00:00:00 2001
From: zimoch <zimoch>
Date: Tue, 13 May 2008 08:32:21 +0000
Subject: [PATCH] For SL5 upgrade: Assume ORACLE_HOME is set and sqlplus is in
 the path.

---
 App/scripts/bootinfo         | 18 +++++++-----------
 App/scripts/bootlink         | 12 ++++--------
 App/scripts/iocBootNotify.sh | 25 ++++++++++++-------------
 3 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/App/scripts/bootinfo b/App/scripts/bootinfo
index 5deb008..fb82281 100755
--- a/App/scripts/bootinfo
+++ b/App/scripts/bootinfo
@@ -28,7 +28,7 @@ function help() {
 
 function version() {
     echo 'Author: D. Zimoch'
-    echo '$Date: 2008/04/28 07:44:16 $'
+    echo '$Date: 2008/05/13 08:32:21 $'
     echo '$Source: /cvs/G/DRV/misc/App/scripts/bootinfo,v $'
     exit 0
 }
@@ -77,18 +77,14 @@ do
   shift
 done
 
-if [ -z "$ORACLE_HOME"; then
-if [ -d /usr/oracle-9.2 ] ; then
-        export ORACLE_HOME=/usr/oracle-9.2
-else
-        export ORACLE_HOME=/usr/oracle-8.1.7
-	export LD_LIBRARY_PATH=$ORACLE_HOME/lib:$LD_LIBRARY_PATH
-fi
+if [ -z "$ORACLE_HOME" ]; then
+    echo "ORACLE_HOME not defined" >&2
+    exit 1
 fi
 
 eval $(resize 2>/dev/null)
 pattern="$JOKER$1$JOKER"
-$ORACLE_HOME/bin/sqlplus -s gfa_public/pub01@gfaprd << EOF
+sqlplus -s gfa_public/pub01@gfaprd << EOF
 SET PAGESIZE 10000;
 SET LINESIZE ${COLUMNS:-120};
 SET FEEDBACK OFF;
@@ -115,7 +111,7 @@ ORDER BY ${ORDER};
 EXIT
 EOF
 # $Name:  $
-# $Id: bootinfo,v 1.18 2008/04/28 07:44:16 zimoch Exp $
+# $Id: bootinfo,v 1.19 2008/05/13 08:32:21 zimoch Exp $
 # $Source: /cvs/G/DRV/misc/App/scripts/bootinfo,v $
-# $Revision: 1.18 $
+# $Revision: 1.19 $
 
diff --git a/App/scripts/bootlink b/App/scripts/bootlink
index 8155216..4ca7d9d 100755
--- a/App/scripts/bootlink
+++ b/App/scripts/bootlink
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ "$1" = "-v" ];then echo "\$Header: /cvs/G/DRV/misc/App/scripts/bootlink,v 1.4 2008/04/28 07:52:01 zimoch Exp $";exit;fi
+if [ "$1" = "-v" ];then echo "\$Header: /cvs/G/DRV/misc/App/scripts/bootlink,v 1.5 2008/05/13 08:32:21 zimoch Exp $";exit;fi
 if [ $# -lt 2 ] || [ "$1" = "-?" ]
 then 
     echo "using: $0 (<newbase>|-) <IOC> [<IOC2> [...]]"
@@ -8,12 +8,8 @@ then
     exit
 fi
 if [ -z "$ORACLE_HOME" ] ; then
-if [ -d /usr/oracle-9.2 ] ; then
-        export ORACLE_HOME=/usr/oracle-9.2
-else
-        export ORACLE_HOME=/usr/oracle-8.1.7
-	export LD_LIBRARY_PATH=$ORACLE_HOME/lib:$LD_LIBRARY_PATH
-fi
+    echo "ORACLE_HOME not defined" >&2
+    exit 1
 fi
 
 targetbase=$1
@@ -26,7 +22,7 @@ shift
 for ioc in $*
 do
     list=$(echo $(
-    $ORACLE_HOME/bin/sqlplus -s gfa_public/pub01@GFAPRD << EOF
+    sqlplus -s gfa_public/pub01@GFAPRD << EOF
     SET HEADING OFF;
     SELECT BOOTPC,SLSBASE FROM HOSTS.IOC_LASTBOOTED WHERE  SYSTEM = '$ioc';
     EXIT
diff --git a/App/scripts/iocBootNotify.sh b/App/scripts/iocBootNotify.sh
index 7c852a7..04a87eb 100755
--- a/App/scripts/iocBootNotify.sh
+++ b/App/scripts/iocBootNotify.sh
@@ -4,11 +4,14 @@
 # The startup script should have the following line:
 # bootNotify SLSBASE,"sls/bin/iocBootNotify.sh"
 
+PATH=/bin:/usr/bin
+. /etc/profile.d/sls_oracle.sh
+
 if [ "$1" = "-v" ]
 then
     echo '$Source: /cvs/G/DRV/misc/App/scripts/iocBootNotify.sh,v $'
     echo '$Author: zimoch $'
-    echo '$Date: 2008/04/28 08:01:53 $'
+    echo '$Date: 2008/05/13 08:32:21 $'
     exit
 fi
 
@@ -58,7 +61,7 @@ then
     exit 1
 fi
 
-BOOTPC=$(/bin/hostname -s)
+BOOTPC=$(hostname -s)
 
 if [ ! -L /ioc/$SYSTEM ]
 then
@@ -72,11 +75,11 @@ case $SYSTEM in
           echo "Rename your system and 'target name' to match *-VME*."
           exit 1 ;;
 esac
-link=$(/usr/bin/readlink /ioc/$SYSTEM)
+link=$(readlink /ioc/$SYSTEM)
 SLSBASE=${link%%/iocBoot*}
 if [ -L $BOOTFILE ]
 then
-  link=$(/usr/bin/readlink $BOOTFILE)
+  link=$(readlink $BOOTFILE)
   tail=${link#../../}
   if [ $tail = $link ]
   then
@@ -103,15 +106,11 @@ echo "VXWORKSVER=$VXWORKSVER"
 echo "ETHADDR=$ETHADDR"
 
 if [ -z "$ORACLE_HOME" ] ; then
-if [ -d /usr/oracle-9.2 ] ; then
-        export ORACLE_HOME=/usr/oracle-9.2
-else
-        export ORACLE_HOME=/usr/oracle-8.1.7
-	export LD_LIBRARY_PATH=$ORACLE_HOME/lib:$LD_LIBRARY_PATH
-fi
+    echo "ORACLE_HOME not defined" >&2
+    exit 1
 fi
 
-$ORACLE_HOME/bin/sqlplus -s gfa_public/pub01@GFAPRD << EOF &
+sqlplus -s gfa_public/pub01@GFAPRD << EOF &
 INSERT INTO HOSTS.IOC_BOOTLOG
        (SYSTEM, IPADDR, PROCNUM, DEVICE, BOOTPC,
         SLSBASE, BOOTFILE, SCRIPT, VXWORKS, EPICSVER,
@@ -122,6 +121,6 @@ VALUES ('$SYSTEM', '$IPADDR', '$PROCNUM', '$DEVICE', '$BOOTPC',
 EXIT
 EOF
 # $Name:  $
-# $Id: iocBootNotify.sh,v 1.11 2008/04/28 08:01:53 zimoch Exp $
+# $Id: iocBootNotify.sh,v 1.12 2008/05/13 08:32:21 zimoch Exp $
 # $Source: /cvs/G/DRV/misc/App/scripts/iocBootNotify.sh,v $
-# $Revision: 1.11 $
+# $Revision: 1.12 $