From d81dbdb65b459ef77e136710168d209991848435 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Fri, 1 Jul 2022 09:52:14 +0200
Subject: [PATCH] allow to opt-out of PVA

---
 iocsh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/iocsh b/iocsh
index c4ae026..4f820a9 100755
--- a/iocsh
+++ b/iocsh
@@ -10,6 +10,7 @@ help () {
     echo " -v, --version   Show version and exit."
     echo " -win            Run Windows softIOC via WINE."
     echo " -32             Force 32 bit version (on 64 bit systems)."
+    echo " --nopva         Do not use PVA (in EPICS 7)"
     echo " -x[.z[.y]]      Select EPICS base version x.z.y (e.g. 3.14.8, 3.15, 7)."
     echo " -d, --debug     Run IOC with gdb."
     echo " -dv             Run IOC with valgrind."
@@ -90,7 +91,7 @@ export IOC
 while true
 do
     case $1 in
-        ( -win )
+        ( -win | --win )
             EPICS_HOST_ARCH=windows-x64
         ;;
         ( -32 )
@@ -100,6 +101,9 @@ do
             unset EPICS_BASE
             BASE=${1#-}
         ;;
+        ( -nopva | --nopva )
+            NOPVA=1
+        ;;
         ( -n )
             shift
             IOC="$1"
@@ -289,6 +293,10 @@ do
         echo "EPICS version $file option must be set earlier" >&2
         exit 1
         ;;
+    ( -nopva | --nopva )
+        echo "Option $file must be set earlier" >&2
+        exit 1
+        ;;
     ( -h | "-?" | -help | --help )
         help
         ;;
@@ -419,7 +427,7 @@ done
 
 if [ "$BASECODE" -ge 3141200 ]
 then
-    if [ -x "$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIocPVA$EXEPOSTFIX" ]
+    if [ -z "$NOPVA" -a -x "$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIocPVA$EXEPOSTFIX" ]
     then
         EXE=$EPICS_BASE/bin/$EPICS_HOST_ARCH/softIocPVA$EXEPOSTFIX
         ARGS="-D $EPICS_BASE/dbd/softIocPVA.dbd"