diff options
| author | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-10-07 21:02:45 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-10-07 21:02:45 +0200 |
| commit | fe60a741224c1238d9cae3f1f53de4e1a517ae25 (patch) | |
| tree | f0c1d8763aa09e8ce37e8cf4d0042c73bc43aa90 | |
| parent | c00a72a02dae8a2e8cee2747c70c53861c4bc079 (diff) | |
| download | plan9front-fe60a741224c1238d9cae3f1f53de4e1a517ae25.tar.xz | |
termrc/cpurc: dont run ipconfig if theres no /net/ipselftab, dont run dns resolver if theres already /net/dns
| -rwxr-xr-x | rc/bin/cpurc | 23 | ||||
| -rwxr-xr-x | rc/bin/termrc | 18 |
2 files changed, 22 insertions, 19 deletions
diff --git a/rc/bin/cpurc b/rc/bin/cpurc index 3838256eb..22d0673cf 100755 --- a/rc/bin/cpurc +++ b/rc/bin/cpurc @@ -17,31 +17,32 @@ mntgen -s slashn && chmod 666 /srv/slashn # name translation, cs sets /dev/sysname ndb/cs sysname=`{cat /dev/sysname} - -# parallelism for mk -NPROC = `{wc -l </dev/sysstat} - if (~ $#sysname 0 || ~ $sysname ''){ sysname=cirno # default echo -n $sysname >/dev/sysname } prompt=($sysname^'# ' ' ') +# parallelism for mk +NPROC=`{wc -l </dev/sysstat} + # cpu-specific startup if(test -e /cfg/$sysname/cpurc) . /cfg/$sysname/cpurc # automatic ip address setup -if(! grep u /net/ipselftab | grep -sv 127.0.0.1){ - ether=`{ndb/query sys $sysname ether} - if(~ $#ether 1){ - # try /lib/ndb first, then do dhcp - ip/ipconfig -N >[2]/dev/null || ip/ipconfig +if(test -r /net/ipselftab){ + if(! grep u /net/ipselftab | grep -sv 127.0.0.1){ + ether=`{ndb/query sys $sysname ether} + if(~ $#ether 1){ + # try /lib/ndb first, then do dhcp + ip/ipconfig -N >[2]/dev/null || ip/ipconfig + } + rm -f /env/ether } - rm -f /env/ether } -if(! test -e /srv/dns) +if(! test -e /net/dns) ndb/dns -r if(! ps|grep -s timesync){ diff --git a/rc/bin/termrc b/rc/bin/termrc index 41ba7ef88..0c8109347 100755 --- a/rc/bin/termrc +++ b/rc/bin/termrc @@ -32,23 +32,25 @@ if(~ $#sysname 0 || ~ $sysname ''){ } # parallelism for mk -NPROC = `{wc -l </dev/sysstat} +NPROC=`{wc -l </dev/sysstat} # machine specific startup (e.g., for devices not probed) if(test -e /cfg/$sysname/termrc) . /cfg/$sysname/termrc # automatic ip address setup -if(! grep u /net/ipselftab | grep -sv 127.0.0.1){ - ether=`{ndb/query sys $sysname ether} - if(~ $#ether 1){ - # try /lib/ndb first, then do dhcp - ip/ipconfig -N >[2]/dev/null || ip/ipconfig +if(test -r /net/ipselftab){ + if(! grep u /net/ipselftab | grep -sv 127.0.0.1){ + ether=`{ndb/query sys $sysname ether} + if(~ $#ether 1){ + # try /lib/ndb first, then do dhcp + ip/ipconfig -N >[2]/dev/null || ip/ipconfig + } + rm -f /env/ether } - rm -f /env/ether } -if(! test -e /srv/dns) +if(! test -e /net/dns) ndb/dns -r if(! ~ $terminal *vx32*){ |