ref: a2fb8e4289917d29e551bab5efe52a55df683653
parent: 6da89d6266511cfbe6f308799e8232a7920a5cc3
parent: 4d3367d11f03639da12829df103c4b6c5ecc78ac
author: cinap_lenrek <[email protected]>
date: Wed Mar 27 10:33:15 EDT 2019
merge
--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -65,7 +65,7 @@
# 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
}
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -66,7 +66,7 @@
# 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
}
--- a/sys/man/8/plan9.ini
+++ b/sys/man/8/plan9.ini
@@ -443,6 +443,8 @@
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 @@
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)
--- a/sys/src/9/boot/net.rc
+++ b/sys/src/9/boot/net.rc
@@ -15,9 +15,9 @@
}
}
- 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
}