From 8d9f3906fa94676f4e788a9668991b815b4f5542 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Wed, 27 Mar 2019 14:11:25 +0100 Subject: plan9.ini: add nora6= option to disable automatic ipv6 configuration --- rc/bin/cpurc | 2 +- rc/bin/termrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'rc') 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 } -- cgit v1.2.3 From f9efc8ed87337b0d1220822b9b0356966f8fce44 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Wed, 27 Mar 2019 14:45:08 +0100 Subject: inst/startether: skip ipv6 auto configuration when nora6 was specified --- rc/bin/inst/startether | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rc') 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 } -- cgit v1.2.3