diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2014-12-10 03:24:21 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2014-12-10 03:24:21 +0100 |
| commit | b305ea4a3daffc7cfc3ca1b24b1b098cd9f14590 (patch) | |
| tree | b34055c4a37b656f82489f0f11072c46149f6671 | |
| parent | 23d6c796cd1dc0c9c2a2b910b79d2dc2bcdbb181 (diff) | |
| parent | ba6cd374129451305421703aeee6a007cb8ac977 (diff) | |
| download | plan9front-b305ea4a3daffc7cfc3ca1b24b1b098cd9f14590.tar.xz | |
merge
| -rwxr-xr-x | sys/src/9/boot/bootrc | 2 | ||||
| -rwxr-xr-x | sys/src/9/boot/net.rc | 7 | ||||
| -rw-r--r-- | sys/src/9/port/bootfs.proto | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc index d3046727a..ed949ec91 100755 --- a/sys/src/9/boot/bootrc +++ b/sys/src/9/boot/bootrc @@ -145,7 +145,7 @@ fn main{ } # 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 diff --git a/sys/src/9/boot/net.rc b/sys/src/9/boot/net.rc index 63697d8ff..42ba9f19e 100755 --- a/sys/src/9/boot/net.rc +++ b/sys/src/9/boot/net.rc @@ -25,6 +25,13 @@ fn confignet{ 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 diff --git a/sys/src/9/port/bootfs.proto b/sys/src/9/port/bootfs.proto index 956601c01..33df1759f 100644 --- a/sys/src/9/port/bootfs.proto +++ b/sys/src/9/port/bootfs.proto @@ -14,7 +14,6 @@ $objtype dd disk fdisk - kfs prep dossrv echo @@ -27,6 +26,8 @@ $objtype mntgen mount mv + ndb + dnsgetip hjfs rc rm |