add /net/ndb to default ndb database files, fix mistakes

This commit is contained in:
cinap_lenrek 2011-06-09 07:35:31 +00:00
parent 4fab38b740
commit 1da0722fe5
8 changed files with 8 additions and 47 deletions

View file

@ -5,9 +5,8 @@ syntax: regexp
^sys/lib/python/.*\.(pyo|pyc|exe)$ ^sys/lib/python/.*\.(pyo|pyc|exe)$
^sys/log/ ^sys/log/
^sys/man/(searchindex|[1-8]/INDEX.*)$ ^sys/man/(searchindex|[1-8]/INDEX.*)$
^(dev|fd|net|srv|env|root|boot|mnt|n|bin|tmp)/ ^(dev|fd|net|srv|env|root|boot|mnt|n|bin|usr|cfg|tmp)/
^(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)/(bin|lib)/ ^(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)/(bin|lib)/
^386/(9(pc|boot).*|pbs|mbr|init) ^386/(9(pc|boot).*|pbs|mbr|init)
^acme/bin/(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)/ ^acme/bin/(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)/
^lib/audio/ ^lib/audio/
^usr/

View file

@ -1,10 +0,0 @@
#!/bin/rc
# the 9pccpuf kernel runs this file
# example: adjust to fit your network
#ip/ipconfig -g 192.168.0.1 ether /net/ether0 192.168.0.2 255.255.255.0
#ndb/dns -rs
#aux/timesync -Ln pool.ntp.org
# outgoing mail will appear to originate from this domain
#site=9front

View file

@ -1,17 +0,0 @@
# the 9pccpuf kernel runs this file
aux/listen -q -t /rc/bin/service.auth -d /rc/bin/service tcp
@{
rfork n
if(~ $monitor vesa)
aux/realemu
aux/vga -l $vgasize
}
switch($mouseport){
case ps2 ps2intellimouse 0 1 2
aux/mouse $mouseport
if(~ $accupoint 1)
pipefile -dr /bin/aux/accupoint /dev/mouse
}
exec rio

View file

@ -1,10 +0,0 @@
#!/bin/rc
# the 9pcf kernerl runs this file
# example: adjust to fit your network
#ip/ipconfig -g 192.168.0.1 ether /net/ether0 192.168.0.2 255.255.255.0
#ndb/dns -r
#aux/timesync -Ln pool.ntp.org
# outgoing mail will appear to originate from this domain
#site=9front

View file

@ -2,6 +2,7 @@
# files comprising the database, use as many as you like, see ndb(6) # files comprising the database, use as many as you like, see ndb(6)
# #
database= database=
file=/net/ndb
file=/lib/ndb/local file=/lib/ndb/local
file=/lib/ndb/common file=/lib/ndb/common

View file

@ -44,7 +44,7 @@ if(! test -e /srv/dns)
if(! ps|grep -s timesync){ if(! ps|grep -s timesync){
if(~ $#ntp 0) if(~ $#ntp 0)
eval `{ndb/ipquery sys $sysname ntp} . <{ndb/ipquery sys $sysname ntp | sed 's, +,\n,g'}
if(~ $#ntp 0) if(~ $#ntp 0)
ntp=pool.ntp.org ntp=pool.ntp.org
aux/timesync -n $ntp aux/timesync -n $ntp
@ -52,7 +52,7 @@ if(! ps|grep -s timesync){
} }
if(~ $#auth 0) if(~ $#auth 0)
eval `{ndb/ipquery sys $sysname auth} . <{ndb/ipquery sys $sysname auth | sed 's, +,\n,g'}
switch($auth){ switch($auth){
case `{ echo $sysname; ndb/query sys $sysname dom case `{ echo $sysname; ndb/query sys $sysname dom
for(i in `{awk '/u\ *$/{print $1}' /net/ipselftab}){ for(i in `{awk '/u\ *$/{print $1}' /net/ipselftab}){
@ -66,12 +66,9 @@ case *
aux/listen -q -d /rc/bin/service tcp aux/listen -q -d /rc/bin/service tcp
} }
# cpu-specific late startup if(test -f /dev/apm)
if(test -e /cfg/$sysname/cpustart) aux/apm
. /cfg/$sysname/cpustart
# mode of /proc/*/ctl is inherited across rfork, and sets modes on # mode of /proc/*/ctl is inherited across rfork, and sets modes on
# other /proc files, such as note, so let listen be killed. # other /proc files, such as note, so let listen be killed.
dontkill '^(ipconfig|factotum|mntgen|venti|kfs|cwfs.*|cs|dns|reboot)$' dontkill '^(ipconfig|factotum|mntgen|venti|kfs|cwfs.*|cs|dns|reboot)$'
exit ''

View file

@ -41,7 +41,7 @@ if(! grep u /net/ipselftab | grep -sv 127.0.0.1){
ether=`{ndb/query sys $sysname ether} ether=`{ndb/query sys $sysname ether}
if(~ $#ether 1){ if(~ $#ether 1){
# try /lib/ndb first, then do dhcp # try /lib/ndb first, then do dhcp
ip/ipconfig -N || ip/ipconfig ip/ipconfig -N >[2]/dev/null || ip/ipconfig
} }
rm -f /env/ether rm -f /env/ether
} }

View file

@ -102,6 +102,7 @@ mkdir -p arm/bin/upas
mkdir -p arm/bin/usb mkdir -p arm/bin/usb
mkdir -p arm/bin/venti mkdir -p arm/bin/venti
mkdir -p arm/lib/ape mkdir -p arm/lib/ape
mkdir -p cfg
mkdir -p cron mkdir -p cron
mkdir -p dist/plan9front mkdir -p dist/plan9front
mkdir -p fd mkdir -p fd