diff options
| -rwxr-xr-x | rc/bin/cpurc | 2 | ||||
| -rwxr-xr-x | rc/bin/termrc | 2 | ||||
| -rw-r--r-- | sys/man/8/plan9.ini | 14 | ||||
| -rwxr-xr-x | sys/src/9/boot/net.rc | 4 |
4 files changed, 18 insertions, 4 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..96ff418fd 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 @@ -865,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) diff --git a/sys/src/9/boot/net.rc b/sys/src/9/boot/net.rc index 79c0b81fa..362716f57 100755 --- a/sys/src/9/boot/net.rc +++ b/sys/src/9/boot/net.rc @@ -15,9 +15,9 @@ fn confignet{ } } - if(~ $1 ether && ~ $#* 2) @{ + if(~ $1 ether || ~ $1 gbe && ~ $#* 2) @{ ip/ipconfig -6 $* - ip/ipconfig $* ra6 recvra 1 & + test -e /env/nora6 || ip/ipconfig $* ra6 recvra 1 & ip/ipconfig -p $* & wait } |