shithub: riscv

Info  •  Files  •  Log  •  Branches

merge

--- a/sys/src/9/boot/bootrc

+++ b/sys/src/9/boot/bootrc

@@ -145,7 +145,7 @@

 	}

 	# remove enviroment variables

-	rm -f /env/^$mt /env/? /env/?? '/env/fn#'* 

+	rm -f '#e/'^$mt '#e/'? '#e/'?? '#e/fn#'* 

 	# remove part of our temporary root

 	/mnt/broot/$cputype/bin/unmount /$cputype/bin /bin

--- a/sys/src/9/boot/net.rc

+++ b/sys/src/9/boot/net.rc

@@ -25,6 +25,13 @@

 	if(~ $#auth 0)

 		ask auth ' ip is? ' $fs(1)

+	# resolve dns names

+	if(test -x /bin/ndb/dnsgetip){

+		for(i in fs auth secstore){

+			$i=`{for(x in $$i) ndb/dnsgetip -a $x}

+		}

+	}

+

 	# set bootstrap authservers for factotum

 	if(! ~ $#auth 0){

 		grep -v '^[ 	]*auth=' /net/ndb >/env/x

--- a/sys/src/9/port/bootfs.proto

+++ b/sys/src/9/port/bootfs.proto

@@ -14,7 +14,6 @@

 		dd

 		disk

 			fdisk

-			kfs

 			prep

 		dossrv

 		echo

@@ -27,6 +26,8 @@

 		mntgen

 		mount

 		mv

+		ndb

+			dnsgetip

 		hjfs

 		rc

 		rm