git: 9front

Download patch

ref: 966e134bf966a92fc8b8abec6639155742bb829c
parent: 1cb04deeb0622b8d57f75b2defaf64acb2874ed4
author: cinap_lenrek <cinap_lenrek@centraldogma>
date: Fri Oct 7 17:02:45 EDT 2011 

termrc/cpurc: dont run ipconfig if theres no /net/ipselftab, dont run dns resolver if theres already /net/dns


--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -17,10 +17,6 @@
 # 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
@@ -27,21 +23,26 @@
 }
 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){
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -32,7 +32,7 @@
 }
 
 # 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)
@@ -39,16 +39,18 @@
 	. /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*){
-- 
⑨