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 +- sys/man/8/plan9.ini | 2 ++ 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 } -- cgit v1.2.3 From 2f5983ba02cfa2719457d6a35f5ec9109c730660 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Wed, 27 Mar 2019 14:17:51 +0100 Subject: bootrc: handle automatic ip configuration on gbe media --- sys/src/9/boot/net.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/src/9/boot/net.rc b/sys/src/9/boot/net.rc index 3ae754fa8..362716f57 100755 --- a/sys/src/9/boot/net.rc +++ b/sys/src/9/boot/net.rc @@ -15,7 +15,7 @@ fn confignet{ } } - if(~ $1 ether && ~ $#* 2) @{ + if(~ $1 ether || ~ $1 gbe && ~ $#* 2) @{ ip/ipconfig -6 $* test -e /env/nora6 || ip/ipconfig $* ra6 recvra 1 & ip/ipconfig -p $* & -- cgit v1.2.3 From 4d3367d11f03639da12829df103c4b6c5ecc78ac Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Wed, 27 Mar 2019 14:31:45 +0100 Subject: plan9.ini(8): add USB section, documenting various usb options --- sys/man/8/plan9.ini | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/man/8/plan9.ini b/sys/man/8/plan9.ini index cf01a45ac..96ff418fd 100644 --- a/sys/man/8/plan9.ini +++ b/sys/man/8/plan9.ini @@ -867,6 +867,18 @@ The main feature of the interface is the ability to watch battery life (see .IR stats (8)). It is not on by default because it causes problems on some laptops. +.SS USB +.SS \fL*nousbprobe=\fP +Disable USB host controller detection. +.SS \fL*nousbohci=\fP +.SS \fL*nousbuhci=\fP +.SS \fL*nousbehci=\fP +.SS \fL*nousbxhci=\fP +Disable specific USB host controller types. +.SS \fLnousbrc=\fP +Disable +.IR nusbrc (8) +startup at boot time. .SS \fLnousbhname=\fP When defined, .IR nusbrc (8) -- cgit v1.2.3