summaryrefslogtreecommitdiff
path: root/rc
diff options
context:
space:
mode:
authorAlex Musolino <alex@musolino.id.au>2019-04-01 23:14:14 +1030
committerAlex Musolino <alex@musolino.id.au>2019-04-01 23:14:14 +1030
commit73235c6b2600c2baf4e88b1c88b592b7ce398a91 (patch)
tree4188ffdb3c0a8d09cbc56c730dcbfc5e221df25e /rc
parent2dd9e4bbd92fac0b687edadead19de338d6cbe6d (diff)
parent5b81e7de3f1ab3691438878cf1da912a54138d5f (diff)
downloadplan9front-73235c6b2600c2baf4e88b1c88b592b7ce398a91.tar.xz
merge
Diffstat (limited to 'rc')
-rwxr-xr-xrc/bin/cpurc2
-rwxr-xr-xrc/bin/inst/startether2
-rwxr-xr-xrc/bin/termrc2
3 files changed, 3 insertions, 3 deletions
diff --git a/rc/bin/cpurc b/rc/bin/cpurc
index ccd5fb090..6a348b833 100755
--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -65,7 +65,7 @@ if(test -r /net/ipselftab){
# try /lib/ndb first, then do dhcp/slaac
ip/ipconfig -6 ether $ether
ip/ipconfig -N ether $ether >[2]/dev/null || @{
- ip/ipconfig ether $ether ra6 recvra 1 &
+ test -e /env/nora6 || ip/ipconfig ether $ether ra6 recvra 1 &
ip/ipconfig -h $sysname ether $ether &
wait
}
diff --git a/rc/bin/inst/startether b/rc/bin/inst/startether
index 852b2f4c3..69408312b 100755
--- a/rc/bin/inst/startether
+++ b/rc/bin/inst/startether
@@ -21,7 +21,7 @@ case go
ip/ipconfig -g $gwaddr ether $netdev $ipaddr $ipmask >>[2]/srv/log
case automatic
>>[2]/srv/log @{
- ip/ipconfig ra6 recvra 1 &
+ test -e /env/nora6 || ip/ipconfig ra6 recvra 1 &
ip/ipconfig &
wait
}
diff --git a/rc/bin/termrc b/rc/bin/termrc
index 14b473c2c..ca5af3442 100755
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -66,7 +66,7 @@ if(test -r /net/ipselftab){
# try /lib/ndb first, then do dhcp/slaac
ip/ipconfig -6 ether $ether
ip/ipconfig -N ether $ether >[2]/dev/null || @{
- ip/ipconfig ether $ether ra6 recvra 1 &
+ test -e /env/nora6 || ip/ipconfig ether $ether ra6 recvra 1 &
ip/ipconfig -h $sysname ether $ether &
wait
}