diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-05-03 10:47:40 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-05-03 10:47:40 +0200 |
| commit | 1de9ca2de54d8f57557c4a4fa5994bac8ddec2fd (patch) | |
| tree | 847f81dab93c9325f660f25481133eec859ce8b9 /sys/src/9/boot | |
| parent | 299cf4e4b9af90497a9ac1b9da0334f51a2d183f (diff) | |
bring back il protocol support
Diffstat (limited to 'sys/src/9/boot')
| -rw-r--r-- | sys/src/9/boot/bootrc | 8 | ||||
| -rwxr-xr-x | sys/src/9/boot/net.rc (renamed from sys/src/9/boot/tcp.rc) | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc index c2b1bbf63..3057df5cb 100644 --- a/sys/src/9/boot/bootrc +++ b/sys/src/9/boot/bootrc @@ -54,7 +54,7 @@ fn ask { } mt=() -. /rc/lib/tcp.rc +. /rc/lib/net.rc . /rc/lib/local.rc fn main{ @@ -63,7 +63,7 @@ fn main{ if(~ $#nobootprompt 0){ echo showlocaldevs - ask bootargs ' is (tcp, local!device)' $"bootargs + ask bootargs ' is (tcp, il, local!device)' $"bootargs } if not bootargs=$nobootprompt nobootprompt=() @@ -92,8 +92,8 @@ fn main{ } if not x=($x -u) - if(! ~ $#authaddr 0) - x=($x -a $authaddr) + if(! ~ $#auth 0) + x=($x -a $auth) if(! ~ $#debugfactotum 0) x=($x -p) must $x diff --git a/sys/src/9/boot/tcp.rc b/sys/src/9/boot/net.rc index 63a6b56c5..946361027 100755 --- a/sys/src/9/boot/tcp.rc +++ b/sys/src/9/boot/net.rc @@ -1,8 +1,7 @@ #!/bin/rc -fn configtcp{ +fn confignet{ must ip/ipconfig -p $* - if(~ $#fs 0) fs=`{awk -F'=' '/fs=/{print $2; exit}' /net/ndb} if(~ $#auth 0) @@ -11,14 +10,16 @@ fn configtcp{ ask fs ' ip is?' $auth if(~ $#auth 0) ask auth ' ip is?' $fs - - fsaddr=tcp!$fs!564 - authaddr=tcp!$auth!567 } fn connecttcp{ - srv -q $"fsaddr boot + srv -q tcp!$fs!564 boot } -mtcp=(configtcp connecttcp) -mt=(mtcp $mt) +fn connectil{ + srv -q il!$fs!17008 boot +} + +mtcp=(confignet connecttcp) +mil=(confignet connectil) +mt=(mtcp mil $mt) |