crop /lib/face/48x48x8/n/nixie.1 to the right size (was 512x512)

[plan9front.git] / rc / bin / termrc

diff --git a/rc/bin/termrc b/rc/bin/termrc
index 046dde487b1c5c9002f5d1a64dbcaf1a5f92601c..ca7c94f79f0ef48b16f69396fa0342bf5c820aee 100755 (executable)
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -32,8 +32,14 @@ if (! ~ $#disk 0)
        swap $disk(1) >/dev/null >[2=1]
 rm -f /env/disk
 
-# cs sets sysname
-ndb/cs
+# we do this before we have a name.  we may need to do network
+# setup so that we can get a name.
+if(test -e /rc/bin/termrc.local)
+       . /rc/bin/termrc.local
+
+# cs sets sysname (termrc.local may already have started it so check)
+if(! test -e /srv/cs && ! test -e /net/cs)
+       ndb/cs
 sysname=`{cat /dev/sysname}
 if(~ $#sysname 0 || ~ $sysname ''){
        sysname=cirno                   # default
@@ -65,14 +71,8 @@ if(! test -e /net/dns)
 if(! ~ $terminal *vx32*){
        # start timesync if it isn't running and we weren't told not to
        if(! ps|grep -s timesync)
-               if(! ~ $TIMESYNCARGS ''){
-                       # afaik the only arm platform we support is the rpi
-                       # and time sync doesn't work on it.
-                       if(! ~ $objtype arm)
-                               aux/timesync $TIMESYNCARGS
-                       if(~ $objtype arm)
-                               echo 'timesync: use another source for time'
-               }
+               if(! ~ $TIMESYNCARGS '')
+                       aux/timesync $TIMESYNCARGS
 }
 
 fn ask {