diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2019-03-27 14:11:25 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2019-03-27 14:11:25 +0100 |
| commit | 8d9f3906fa94676f4e788a9668991b815b4f5542 (patch) | |
| tree | 2dcf871da3d77a065bcc8ec59fe8e6112b3da136 | |
| parent | 41d4cecf6d55af3ee0ced4c45d34450f4501608b (diff) | |
| download | plan9front-8d9f3906fa94676f4e788a9668991b815b4f5542.tar.xz | |
plan9.ini: add nora6= option to disable automatic ipv6 configuration
| -rwxr-xr-x | rc/bin/cpurc | 2 | ||||
| -rwxr-xr-x | rc/bin/termrc | 2 | ||||
| -rw-r--r-- | sys/man/8/plan9.ini | 2 | ||||
| -rwxr-xr-x | sys/src/9/boot/net.rc | 2 |
4 files changed, 5 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/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 } diff --git a/sys/man/8/plan9.ini b/sys/man/8/plan9.ini index 9e1565a2f..cf01a45ac 100644 --- a/sys/man/8/plan9.ini +++ b/sys/man/8/plan9.ini @@ -443,6 +443,8 @@ to be present on attach in or .B /boot. See iwl section above for configuration details. +.SS \fLnora6= +Disable automatic IPv6 configuration from incoming router advertisements. .SS DISKS, TAPES (S)ATA controllers are autodetected. .SS \fL*nodma=\fP diff --git a/sys/src/9/boot/net.rc b/sys/src/9/boot/net.rc index 79c0b81fa..3ae754fa8 100755 --- a/sys/src/9/boot/net.rc +++ b/sys/src/9/boot/net.rc @@ -17,7 +17,7 @@ fn confignet{ if(~ $1 ether && ~ $#* 2) @{ ip/ipconfig -6 $* - ip/ipconfig $* ra6 recvra 1 & + test -e /env/nora6 || ip/ipconfig $* ra6 recvra 1 & ip/ipconfig -p $* & wait } |