summaryrefslogtreecommitdiff
path: root/rc
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2019-03-27 14:33:15 +0100
committercinap_lenrek <cinap_lenrek@felloff.net>2019-03-27 14:33:15 +0100
commita2fb8e4289917d29e551bab5efe52a55df683653 (patch)
treefd2f6164cb50a317ec1055a914d1d5060dfce4b9 /rc
parent6da89d6266511cfbe6f308799e8232a7920a5cc3 (diff)
parent4d3367d11f03639da12829df103c4b6c5ecc78ac (diff)
downloadplan9front-a2fb8e4289917d29e551bab5efe52a55df683653.tar.xz
merge
Diffstat (limited to 'rc')
-rwxr-xr-xrc/bin/cpurc2
-rwxr-xr-xrc/bin/termrc2
2 files changed, 2 insertions, 2 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/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
}