import E script from bell labs

4 files changed, 14 insertions, 3 deletions

diff --git a/sys/src/9/boot/boot.h b/sys/src/9/boot/boot.h
index c72622807..db7130922 100644
--- a/sys/src/9/boot/boot.h
+++ b/sys/src/9/boot/boot.h
@@ -1,5 +1,5 @@
 enum {
-	Debug = 0,
+	Debug = 1,
 };
 
 extern void	fatal(char*);
diff --git a/sys/src/9/boot/bootfs.proto b/sys/src/9/boot/bootfs.proto
index 02ca92979..a9e973a73 100644
--- a/sys/src/9/boot/bootfs.proto
+++ b/sys/src/9/boot/bootfs.proto
@@ -30,12 +30,15 @@ $objtype
 		ndb
 			dnsgetip
 		hjfs
+		p
+		ps
 		rc
 		rm
 		sed
 		sleep
 		srv
 		test
+		tlsclient
 		unmount
 		nusb
 			usbd
diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc
index 208122f72..eb451f2a4 100755
--- a/sys/src/9/boot/bootrc
+++ b/sys/src/9/boot/bootrc
@@ -66,7 +66,7 @@ fn main{
 		if(~ $#nobootprompt 0){
 			echo
 			showlocaldevs
-			ask bootargs ' is (tcp, il, local!device)' $"bootargs
+			ask bootargs ' is (tcp, tcptls, il, local!device)' $"bootargs
 		}
 		if not bootargs=$nobootprompt
 		nobootprompt=()
diff --git a/sys/src/9/boot/net.rc b/sys/src/9/boot/net.rc
index fb399ef97..a3e673834 100755
--- a/sys/src/9/boot/net.rc
+++ b/sys/src/9/boot/net.rc
@@ -48,6 +48,12 @@ fn connecttcp{
 	fs=$fs(1)
 }
 
+fn connecttcptls{
+	while(! ~ $#fs 0 && ! srv -qe 'tlsclient -t <{echo $fsthumb} tcp!'^$fs(1)^!5564 boot)
+		fs=$fs(2-);
+	fs=$fs(1)
+}
+
 fn connectil{
 	while(! ~ $#fs 0 && ! srv -q il!$fs(1)^!17008 boot)
 		fs=$fs(2-);
@@ -55,5 +61,7 @@ fn connectil{
 }
 
 mtcp=(confignet connecttcp)
+mtcptls=(confignet connecttcptls)
 mil=(confignet connectil)
-mt=(mtcp mil $mt)
+mt=(mtcp mtcptls mil $mt)
+