From 7472c82044742aca5bc6369837f605ca8ba680f1 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Thu, 20 Oct 2022 16:46:04 +0200
Subject: [PATCH] changes for new boot PCs and better standalone support

---
 startup-vxWorks | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/startup-vxWorks b/startup-vxWorks
index ebd0bd2..a626465 100644
--- a/startup-vxWorks
+++ b/startup-vxWorks
@@ -37,25 +37,27 @@ resolvInit "129.129.190.11","psi.ch"
 IS_SLS=(sysBootHost&0xdf000000)==0x58000000||(sysBootHost&0xdfdfdf00)==0x534c5300
 IS_HIPA=(sysBootHost&0xdfdfdfdf)==0x48495041
 IS_PROSCAN=(sysBootHost&0xdfdfdf00)==0x50524f00
-FACILITY=IS_SLS?"sls":IS_HIPA?"hipa":IS_PROSCAN?"proscan":"unknown"
+IS_STANDALONE=!(IS_SLS||IS_HIPA||IS_PROSCAN)
+FACILITY=IS_SLS?"sls":IS_HIPA?"hipa":IS_PROSCAN?"proscan":""
 printf "FACILITY = %s\n", FACILITY
 
 # Set NFS user 'ioc' and group 'unx-FACILITY_ioc'
 nfsAuthUnixSet &sysBootHost,500,IS_SLS?35365:IS_HIPA?35344:IS_PROSCAN?35401:9102
 
 # Do the NFS mounts (only one of each mount will succeed)
-NFS_SERVER="gfa-vfs-ioc"
-MOUNTDIR=malloc(48)
-sprintf  MOUNTDIR,"/export/%s/ioc/epics",FACILITY
-nfsMount NFS_SERVER,MOUNTDIR,"/epics"
+NFS_SERVER=IS_STANDALONE?&sysBootHost:"gfa-vfs-ioc"
+NFS_BASE=malloc(16)
+sprintf  NFS_BASE,"%s%s",IS_STANDALONE?"":"/export/",FACILITY
+NFS_DIR=malloc(48)
+sprintf  NFS_DIR,"%s/ioc/epics",NFS_BASE
+nfsMount NFS_SERVER,NFS_DIR,"/epics"
 nfsMount NFS_SERVER,"/usr/local/epics","/epics"
-nfsMount &sysBootHost,"/usr/local/epics","/epics"
-sprintf  MOUNTDIR,"/export/%s/ioc",FACILITY
-nfsMount NFS_SERVER,MOUNTDIR,"/ioc"
-nfsMount &sysBootHost,"/ioc","/ioc"
-sprintf  MOUNTDIR,"/export/%s/ioc_data",FACILITY
-nfsMount NFS_SERVER,MOUNTDIR,"/ioc/data"
-nfsMount &sysBootHost,"/ioc/data","/ioc/data"
+sprintf  NFS_DIR,"%s/ioc",NFS_BASE
+nfsMount NFS_SERVER,NFS_DIR,"/ioc"
+sprintf  NFS_DIR,"%s/ioc/data",NFS_BASE
+nfsMount NFS_SERVER,NFS_DIR,"/ioc/data"
+sprintf  NFS_DIR,"%s/ioc_data",NFS_BASE
+nfsMount NFS_SERVER,NFS_DIR,"/ioc/data"
 
 # We should now have /epics, /ioc and maybe /ioc/data
 nfsDevShow