fix for OBLA network: don't use WLHA settings

This commit is contained in:
2016-04-14 08:47:51 +02:00
parent 0f8c9a556b
commit 1d2e6b158e
+6 -6
View File
@@ -8,15 +8,15 @@ epicsEnvSet CA_129.129.130,"129.129.131.255 129.129.137.255"
epicsEnvSet CA_129.129.131,"129.129.130.255 129.129.137.255"
epicsEnvSet CA_129.129.137,"129.129.130.255 129.129.131.255"
# WHLA (FIN machine networks)
epicsEnvSet CA_172.21,"172.21.10.255 172.21.11.255 172.21.12.255 172.21.13.255"
epicsEnvSet CA_AUTO_172.21,"NO"
epicsEnvSet CA_BEACON_172.21,"$(CA_172.21)"
epicsEnvSet CA_AUTO_BEACON_172.21,NO
epicsEnvSet CA_172.21.10,"172.21.11.255 172.21.12.255 172.21.13.255"
epicsEnvSet CA_172.21.11,"172.21.10.255 172.21.12.255 172.21.13.255"
epicsEnvSet CA_172.21.12,"172.21.10.255 172.21.11.255 172.21.13.255"
epicsEnvSet CA_172.21.13,"172.21.10.255 172.21.11.255 172.21.12.255"
# OSFA (SF machine networks)
epicsEnvSet CA_172.26,"sf-cans-01 sf-cans-02"
epicsEnvSet CA_AUTO_172.26,"NO"
epicsEnvSet CA_BEACON_172.26,"172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.120.255"
epicsEnvSet CA_AUTO_BEACON_172.26,NO
epicsEnvSet CA_AUTO_BEACON_172.26,"NO"
# All others can work with the defaults: automatic
# Apply settings dependent on network
system ("/sbin/ifconfig | awk -F '[.: ]+' -v P='epicsEnvSet NET' -v K=, '/192.168/ {next} /Bcast/ {print P 1 K $9; print P 2 K $10; print P 3 K $11; exit}'>/tmp/$(IOC).net")
@@ -24,7 +24,7 @@ system ("/sbin/ifconfig | awk -F '[.: ]+' -v P='epicsEnvSet NET' -v K=, '/192.1
system ("rm /tmp/$(IOC).net")
epicsEnvSet EPICS_CA_ADDR_LIST,"$(CA_$(NET1=).$(NET2=).$(NET3=)=$(CA_$(NET1=).$(NET2=)=))"
epicsEnvSet EPICS_CA_AUTO_ADDR_LIST,"$(CA_AUTO_$(NET1=).$(NET2=).$(NET3=)=$(CA_AUTO_$(NET1=).$(NET2=)=YES))"
epicsEnvSet EPICS_CAS_BEACON_ADDR_LIST,"$(CA_BEACON_$(NET1=).$(NET2=).$(NET3=)=$(CA_BEACON_$(NET1=).$(NET2=)=))"
epicsEnvSet EPICS_CAS_BEACON_ADDR_LIST,"$(CA_BEACON_$(NET1=).$(NET2=).$(NET3=)=$(CA_BEACON_$(NET1=).$(NET2=)=$(EPICS_CA_ADDR_LIST)))"
epicsEnvSet EPICS_CAS_BEACON_AUTO_ADDR_LIST,"$(CA_AUTO_BEACON_$(NET1=).$(NET2=).$(NET3=)=$(CA_AUTO_BEACON_$(NET1=).$(NET2=)=YES))"
epicsEnvSet TEMPLATES, $(INSTBASE)/iocBoot/templates