xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2019-03-27 14:33:15 +01:00
commit a2fb8e4289
4 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rc/bin/cpurc
View file

@ -65,7 +65,7 @@ if(test -r /net/ipselftab){
# try /lib/ndb first, then do dhcp/slaac # try /lib/ndb first, then do dhcp/slaac
ip/ipconfig -6 ether $ether ip/ipconfig -6 ether $ether
ip/ipconfig -N ether $ether >[2]/dev/null || @{ 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 & ip/ipconfig -h $sysname ether $ether &
wait wait
} }

2
rc/bin/termrc
View file

@ -66,7 +66,7 @@ if(test -r /net/ipselftab){
# try /lib/ndb first, then do dhcp/slaac # try /lib/ndb first, then do dhcp/slaac
ip/ipconfig -6 ether $ether ip/ipconfig -6 ether $ether
ip/ipconfig -N ether $ether >[2]/dev/null || @{ 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 & ip/ipconfig -h $sysname ether $ether &
wait wait
} }

14
sys/man/8/plan9.ini
View file

@ -443,6 +443,8 @@ to be present on attach in
or or
.B /boot. .B /boot.
See iwl section above for configuration details. See iwl section above for configuration details.
.SS \fLnora6=
Disable automatic IPv6 configuration from incoming router advertisements.
.SS DISKS, TAPES .SS DISKS, TAPES
(S)ATA controllers are autodetected. (S)ATA controllers are autodetected.
.SS \fL*nodma=\fP .SS \fL*nodma=\fP
@ -865,6 +867,18 @@ The main feature of the interface is the ability to watch
battery life (see battery life (see
.IR stats (8)). .IR stats (8)).
It is not on by default because it causes problems on some laptops. 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 .SS \fLnousbhname=\fP
When defined, When defined,
.IR nusbrc (8) .IR nusbrc (8)

4
sys/src/9/boot/net.rc
View file

@ -15,9 +15,9 @@ fn confignet{
} }
} }
if(~ $1 ether && ~ $#* 2) @{ if(~ $1 ether || ~ $1 gbe && ~ $#* 2) @{
ip/ipconfig -6 $* ip/ipconfig -6 $*
ip/ipconfig $* ra6 recvra 1 & test -e /env/nora6 || ip/ipconfig $* ra6 recvra 1 &
ip/ipconfig -p $* & ip/ipconfig -p $* &
wait wait
} }