change cpurc to look for service folder in /cfg/$sysname and /cfg/default

This commit is contained in:
aiju 2017-04-19 09:00:44 +00:00
parent 9dee37a2b0
commit 759651e8a9

View file

@ -72,6 +72,12 @@ if(~ $#auth 0){
auth=`{ndb/query sys $sysname auth} auth=`{ndb/query sys $sysname auth}
. <{ndb/ipquery sys $sysname auth | sed 's, +,\n,g'} . <{ndb/ipquery sys $sysname auth | sed 's, +,\n,g'}
} }
if(test -d /cfg/$sysname/service)
serviced=/cfg/$sysname/service
if not if(test -d /cfg/default/service)
serviced=/cfg/default/service
if not
serviced=/rc/bin/service
switch($auth){ switch($auth){
case `{ echo $sysname; ndb/query sys $sysname dom case `{ echo $sysname; ndb/query sys $sysname dom
if(test -r /net/ipselftab){ if(test -r /net/ipselftab){
@ -81,10 +87,10 @@ case `{ echo $sysname; ndb/query sys $sysname dom
# cpu+auth server # cpu+auth server
auth/keyfs -wp -m /mnt/keys /adm/keys auth/keyfs -wp -m /mnt/keys /adm/keys
aux/listen -q -t /rc/bin/service.auth -d /rc/bin/service tcp aux/listen -q -t /rc/bin/service.auth -d $serviced tcp
case * case *
# cpu server # cpu server
aux/listen -q -d /rc/bin/service tcp aux/listen -q -d $serviced tcp
} }
if(test -f /dev/apm) if(test -f /dev/apm)