From bd5bc9a992ec53cfd15d2a664c62160327312057 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Fri, 2 Sep 2022 15:34:21 +0200
Subject: [PATCH] integrate boots from local bootpc (without external NFS
 server)

---
 network.local   |  4 ----
 startup-vxWorks | 17 +++++++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 network.local

diff --git a/network.local b/network.local
deleted file mode 100644
index 1314c01..0000000
--- a/network.local
+++ /dev/null
@@ -1,4 +0,0 @@
-# setup mount points (locally from boot pc)
-nfsMount (&sysBootHost, "/home/ioc", "/home/ioc")
-nfsMount (&sysBootHost, "/ioc", "/ioc")
-nfsMount (&sysBootHost,"/work","/work")
diff --git a/startup-vxWorks b/startup-vxWorks
index f864bc7..cfcc8c1 100644
--- a/startup-vxWorks
+++ b/startup-vxWorks
@@ -43,17 +43,22 @@ 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 /epics mount will succeed)
+# 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"
-nfsMount NFS_SERVER, "/usr/local/epics", "/epics"
-nfsMount &sysBootHost, "/usr/local/epics", "/epics"
+nfsMount NFS_SERVER,MOUNTDIR,"/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 NFS_SERVER,MOUNTDIR,"/ioc"
+nfsMount &sysBootHost,"/ioc","/ioc"
 sprintf  MOUNTDIR,"/export/%s/ioc_data",FACILITY
-nfsMount NFS_SERVER, MOUNTDIR, "/ioc/data"
+nfsMount NFS_SERVER,MOUNTDIR,"/ioc/data"
+nfsMount &sysBootHost,"/ioc/data","/ioc/data"
+
+# We should now have /epics, /ioc and maybe /ioc/data
+nfsDevShow
 
 # Create some path variables
 HOME=malloc(80)