diff options
| author | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-06-06 01:31:58 +0000 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-06-06 01:31:58 +0000 |
| commit | 4a98f5c1d17b71e1e61982b933135b86e9e3d961 (patch) | |
| tree | 48edcd7deff00e6cfa936202123287d2b76447f1 /rc/bin/termrc | |
| parent | 78828434f7d21d90ed83fa35f15f8a8efb92ee7b (diff) | |
merge (term cpu)^rc.local with (term cpu)^rc, mount /srv/cons in (term cpu)^rc instead of /lib/namespace as we dont want to have it in every namespace (cpu session).
Diffstat (limited to 'rc/bin/termrc')
| -rwxr-xr-x | rc/bin/termrc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/rc/bin/termrc b/rc/bin/termrc index ec92f330d..8444bfb78 100755 --- a/rc/bin/termrc +++ b/rc/bin/termrc @@ -1,7 +1,6 @@ #!/bin/rc # terminal startup TIMESYNCARGS=(-rLa1000000) -NDBFILE=/lib/ndb/local mntgen -s slashn && chmod 666 /srv/slashn @@ -10,6 +9,7 @@ for(i in S f k t m i v L P u U A '$' Σ κ) bind -a '#'^$i /dev >/dev/null >[2=1] rm -f /env/i +mount -qb /srv/cons /dev mount -qa /srv/usb /dev # set up any partitions @@ -21,20 +21,17 @@ if (! ~ $#disk 0) swap $disk(1) >/dev/null >[2=1] rm -f /env/disk -# 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 -f $NDBFILE +# cs sets sysname +ndb/cs sysname=`{cat /dev/sysname} if(~ $#sysname 0 || ~ $sysname ''){ sysname=cirno # default echo -n $sysname >/dev/sysname } +# parallelism for mk +NPROC = `{wc -l </dev/sysstat} + # machine specific startup (e.g., for devices not probed) if(test -e /cfg/$sysname/termrc) . /cfg/$sysname/termrc |