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

rename pcf kernel to pc, remove pcf, pccpuf, pccpu64 kernels, update documentation

Browse source 
there isnt much of a point in keep maintaining separate
kernel configurations for terminal and cpu kernels as
the role can be switched with service=cpu boot parameter.

to make stuff cosistent, we will just have one "pc" kernel
and one "pc64" kernel configuration now.
This commit is contained in:
cinap_lenrek 2017-09-10 22:35:23 +02:00
parent 9af1153451
commit be7f3fb5e4
13 changed files with 23 additions and 322 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rc/bin/inst/bootsetup
View file

@ -31,7 +31,7 @@ case go
export 9fat export 9fat
if(! test -f /tmp/plan9.ini) { if(! test -f /tmp/plan9.ini) {
bootfile=9pcf bootfile=9pc
@{ @{
echo 'bootfile='^$bootfile echo 'bootfile='^$bootfile
echo 'bootargs=local!'^$fs' '$"fsflags echo 'bootargs=local!'^$fs' '$"fsflags
@ -82,7 +82,7 @@ case go
logprog mount -c /srv/dos /n/9fat $9fat logprog mount -c /srv/dos /n/9fat $9fat
logprog rm -f /n/9fat/^(9bootfat plan9.ini 9pcf) logprog rm -f /n/9fat/^(9bootfat plan9.ini 9pc)
logprog cp /n/newfs/386/9bootfat /n/9fat/9bootfat logprog cp /n/newfs/386/9bootfat /n/9fat/9bootfat
# make file continous on disk # make file continous on disk
@ -92,7 +92,7 @@ case go
logprog cp /tmp/plan9.ini /n/9fat/plan9.ini logprog cp /tmp/plan9.ini /n/9fat/plan9.ini
# copy kernel # copy kernel
logprog cp /n/newfs/386/9pcf /n/9fat/9pcf logprog cp /n/newfs/386/9pc /n/9fat/9pc
# copy efi bootloader # copy efi bootloader
logprog mkdir -p /n/9fat/efi/boot logprog mkdir -p /n/9fat/efi/boot

2
sys/lib/dist/cfg/plan9.ini vendored
View file

@ -3,4 +3,4 @@ cdboot=yes
mouseport=ask mouseport=ask
monitor=ask monitor=ask
vgasize=ask vgasize=ask
bootfile=/386/9pcf bootfile=/386/9pc

4
sys/lib/dist/ndb/local.complicated vendored
View file

@ -100,11 +100,11 @@ ipnet=mysubnetwork ip=10.0.1.0 ipmask=255.255.255.0
# #
ip=10.0.1.10 ether=0010dc724074 sys=fs ip=10.0.1.10 ether=0010dc724074 sys=fs
dom=myfileserver.myuniversity.edu dom=myfileserver.myuniversity.edu
bootf=/386/9pcfs bootf=/386/9pc
ip=10.0.1.11 ether=0010dc724075 sys=auth ip=10.0.1.11 ether=0010dc724075 sys=auth
dom=myauthserver.myuniversity.edu dom=myauthserver.myuniversity.edu
bootf=/386/9pccpu bootf=/386/9pc
ip=10.0.1.12 ether=0010dc724076 sys=term ip=10.0.1.12 ether=0010dc724076 sys=term
dom=myterminal.myuniversity.edu dom=myterminal.myuniversity.edu

2
sys/man/4/tftpfs
View file

@ -66,7 +66,7 @@ dot in the kernel path).
.IP .IP
.EX .EX
ip/tftpfs 10.192.254.53 ip/tftpfs 10.192.254.53
echo reboot /n/tftp/386/9pcf. >/dev/reboot echo reboot /n/tftp/386/9pc. >/dev/reboot
.EE .EE
.SH SOURCE .SH SOURCE
.B /sys/src/cmd/ip/tftpfs.c .B /sys/src/cmd/ip/tftpfs.c

8
sys/man/8/booting
View file

@ -21,7 +21,7 @@ To bootstrap a diskless terminal or a CPU server, a file server must be running.
On a PC, the On a PC, the
.IR 9boot (8) .IR 9boot (8)
program is used to load the kernel program is used to load the kernel
.B /386/9pcf .B /386/9pc
into memory. into memory.
.PP .PP
Once the kernel is booted, it behaves like the others. Once the kernel is booted, it behaves like the others.
@ -32,8 +32,10 @@ for details.
The Plan 9 CPU servers are multi-user, so they do not request a user name The Plan 9 CPU servers are multi-user, so they do not request a user name
when booting. when booting.
.SS PC CPU Server .SS PC CPU Server
Proceed as for the PC terminal, but load Proceed as for the PC terminal, but have
.B /386/9pccpuf . .B service=cpu
set in
.IR plan9.ini (8).
.SS SGI Challenge multiprocessor CPU Server .SS SGI Challenge multiprocessor CPU Server
The Challenge ROM monitor can boot from the Ethernet. The Challenge ROM monitor can boot from the Ethernet.
To boot from the Ethernet, type To boot from the Ethernet, type

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

@ -949,7 +949,7 @@ modemport=1
serial0=type=generic port=0x3E8 irq=5 serial0=type=generic port=0x3E8 irq=5
monitor=445x monitor=445x
vgasize=1600x1200x8 vgasize=1600x1200x8
bootfile=/386/9pcf bootfile=/386/9pc
% %
.EE .EE
.SH "SEE ALSO" .SH "SEE ALSO"

2
sys/man/8/prep
View file

@ -737,7 +737,7 @@ disk/mbr -m /386/mbr /dev/sdC0/data
disk/fdisk -baw /dev/sdC0/data disk/fdisk -baw /dev/sdC0/data
disk/prep -bw -a^(9fat nvram fscache fsworm other swap) /dev/sdC0/plan9 disk/prep -bw -a^(9fat nvram fscache fsworm other swap) /dev/sdC0/plan9
disk/format -b /386/pbs -d -r 2 /dev/sdC0/9fat \e disk/format -b /386/pbs -d -r 2 /dev/sdC0/9fat \e
/386/9bootfat /386/9pcf /tmp/plan9.ini /386/9bootfat /386/9pc /tmp/plan9.ini
.EE .EE
.SH FILES .SH FILES
.TP .TP

5
sys/src/9/pc/mkfile
View file

@ -1,6 +1,5 @@
CONF=pcf CONF=pc
CONFLIST=pcf pccpuf CONFLIST=pc pcf pccpuf
CRAPLIST=pc pccpu pccd pcflop
EXTRACOPIES= EXTRACOPIES=
#EXTRACOPIES=lookout boundary # copy to these servers on install #EXTRACOPIES=lookout boundary # copy to these servers on install

0
sys/src/9/pc/pcf → sys/src/9/pc/pc
View file

152
sys/src/9/pc/pccpuf
View file

@ -1,152 +0,0 @@
# pccpuf - pc cpu server with local disk
dev
root
cons
arch
pnp pci
env
pipe
proc
mnt
srv
shr
dup
rtc
ssl
tls
bridge log
sdp thwack unthwack
cap
kprof
fs
ether netif
ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium ptclbsum386 inferno
draw screen vga vgax swcursor
mouse mouse
kbd
vga
sd
audio dma
floppy dma
aoe
uart
usb
link
segdesc
devpccard
devi82365
cputemp
apm apmjump
ether2000 ether8390
ether2114x pci
ether589 etherelnk3
ether79c970 pci
ether8003 ether8390
ether8139 pci
ether8169 pci ethermii
ether82543gc pci
ether82563 pci
ether82557 pci
ether82598 pci
ether83815 pci
etherdp83820 pci
etherbcm pci
etherec2t ether8390
etherelnk3 pci
etherga620 pci
etherigbe pci ethermii
ethervgbe pci ethermii
ethervt6102 pci ethermii
ethervt6105m pci ethermii
# etherm10g pci
ethersink
ethersmc devi82365 cis
etheryuk pci
etherwavelan wavelan devi82365 cis pci
etheriwl pci wifi
etherwpi pci wifi
etherrt2860 pci wifi
ethervirtio pci
ethermedium
netdevmedium
loopbackmedium
usbuhci
usbohci
usbehci usbehcipc
audiosb16 dma
audioac97 audioac97mix
audiohda
misc
archacpi mp apic squidboy
archmp mp apic squidboy
mtrr
ec
uarti8250
uartisa
uartpci pci
sdaoe
sdide pci sdscsi
sd53c8xx pci sdscsi
sdmylex pci sdscsi
sdiahci pci sdscsi led
sdodin pci sdscsi led
sdvirtio pci sdscsi
sdmmc pci pmmc
sdnvme pci
sdloop
vga3dfx +cur
vgaark2000pv +cur
vgabt485 =cur
vgaclgd542x +cur
vgaclgd546x +cur
vgact65545 +cur
vgacyber938x +cur
vgaet4000 +cur
vgageode +cur
vgahiqvideo +cur
vgai81x +cur
vgaigfx +cur
vgamach64xx +cur
vgamga2164w +cur
vgamga4xx +cur
vganeomagic +cur
vganvidia +cur
vgaradeon +cur
vgargb524 =cur
vgas3 +cur vgasavage
vgat2r4 +cur
vgatvp3020 =cur
vgatvp3026 =cur
vgavesa
vgavmware +cur
ip
tcp
udp
ipifc
icmp
icmp6
gre
ipmux
esp
rudp
il
port
int cpuserver = 1;
bootdir
/$objtype/bin/paqfs
/$objtype/bin/auth/factotum
bootfs.paq
boot

148
sys/src/9/pc64/pccpu64
View file

@ -1,148 +0,0 @@
# pcf - pc terminal with local disk
dev
root
cons
arch
pnp pci
env
pipe
proc
mnt
srv
shr
dup
rtc
ssl
tls
cap
kprof
fs
ether netif
ip arp chandial ip ipv6 ipaux iproute netlog ethermedium nullmedium pktmedium inferno
draw screen vga vgax swcursor
mouse mouse
kbd
vga
sd
# floppy dma
aoe
# lpt
audio dma
# pccard
# i82365 cis
uart
usb
link
# devpccard
# devi82365
# cputemp
# ether2000 ether8390
# ether2114x pci
# ether589 etherelnk3
ether79c970 pci
# ether8003 ether8390
ether8139 pci
# ether8169 pci ethermii
# should be obsoleted by igbe
# ether82543gc pci
# ether82557 pci
ether82563 pci
# ether82598 pci
# ether83815 pci
etherbcm pci
# etherdp83820 pci
# etherec2t ether8390
# etherelnk3 pci
# etherga620 pci
etherigbe pci ethermii
# ethervgbe pci ethermii
# ethervt6102 pci ethermii
# ethervt6105m pci ethermii
# ethersink
# ethersmc devi82365 cis
# etheryuk pci
# etherwavelan wavelan devi82365 cis pci
etheriwl pci wifi
# etherrt2860 pci wifi
ethervirtio pci
ethermedium
# pcmciamodem
netdevmedium
loopbackmedium
usbuhci
# usbohci
usbehci usbehcipc
# audiosb16 dma
# audioac97 audioac97mix
audiohda
misc
archacpi mp apic squidboy ec
archmp mp apic squidboy
mtrr
sdaoe
sdide pci sdscsi
# sd53c8xx pci sdscsi
# sdmylex pci sdscsi
sdiahci pci sdscsi led
# sdodin pci sdscsi led
sdvirtio pci sdscsi
sdmmc pci pmmc
sdloop
uarti8250
# uartisa
# uartpci pci
# vga3dfx +cur
# vgaark2000pv +cur
# vgabt485 =cur
# vgaclgd542x +cur
# vgaclgd546x +cur
# vgact65545 +cur
# vgacyber938x +cur
# vgaet4000 +cur
# vgageode +cur
# vgahiqvideo +cur
# vgai81x +cur
# vgamach64xx +cur
# vgamga2164w +cur
# vgamga4xx +cur
# vganeomagic +cur
# vganvidia +cur
# vgaradeon +cur
# vgargb524 =cur
# vgas3 +cur vgasavage
# vgat2r4 +cur
# vgatvp3020 =cur
# vgatvp3026 =cur
vgavesa
# vgavmware +cur
ip
tcp
udp
rudp
ipifc
icmp
icmp6
gre
ipmux
esp
il
port
int cpuserver = 1;
bootdir
/$objtype/bin/paqfs
/$objtype/bin/auth/factotum
bootfs.paq
boot

8
sys/src/boot/efi/mkfile
View file

@ -79,8 +79,8 @@ test.iso:D: efiboot.fat
mkdir tmp/386 mkdir tmp/386
cp efiboot.fat tmp/386 cp efiboot.fat tmp/386
cp /386/9bootiso tmp/386 cp /386/9bootiso tmp/386
cp /386/9pcf tmp/386 cp /386/9pc tmp/386
echo 'bootfile=/386/9pcf' >tmp/cfg/plan9.ini echo 'bootfile=/386/9pc' >tmp/cfg/plan9.ini
disk/mk9660 -B 386/9bootiso -E 386/efiboot.fat -p <{echo +} -s tmp $target disk/mk9660 -B 386/9bootiso -E 386/efiboot.fat -p <{echo +} -s tmp $target
rm -r tmp rm -r tmp
@ -95,8 +95,8 @@ test.fat:D: bootia32.efi bootx64.efi
mkdir /n/esp/efi/boot mkdir /n/esp/efi/boot
cp bootia32.efi /n/esp/efi/boot cp bootia32.efi /n/esp/efi/boot
cp bootx64.efi /n/esp/efi/boot cp bootx64.efi /n/esp/efi/boot
cp /386/9pcf /n/esp cp /386/9pc /n/esp
echo 'bootfile=9pcf' >/n/esp/plan9.ini echo 'bootfile=9pc' >/n/esp/plan9.ini
unmount /n/esp unmount /n/esp
rm /srv/$s rm /srv/$s

6
sys/src/boot/pc/mkfile
View file

@ -62,7 +62,7 @@ test.iso: 9bootiso 9boothyb 9bootfat mbr pbs
mkdir tmp/386 mkdir tmp/386
mkdir tmp/cfg mkdir tmp/cfg
cp 9bootiso tmp/386 cp 9bootiso tmp/386
cp /386/9pcf tmp/386 cp /386/9pc tmp/386
cp /sys/lib/dist/cfg/plan9.ini tmp/cfg/plan9.ini cp /sys/lib/dist/cfg/plan9.ini tmp/cfg/plan9.ini
echo wait >>tmp/cfg/plan9.ini echo wait >>tmp/cfg/plan9.ini
disk/mk9660 -B 386/9bootiso -p <{echo +} -s tmp $target disk/mk9660 -B 386/9bootiso -p <{echo +} -s tmp $target
@ -86,8 +86,8 @@ test.dsk: 9bootfat mbr pbs test.iso
mkdir tmp mkdir tmp
cp test.iso 9bootfat tmp cp test.iso 9bootfat tmp
mkdir tmp/386 mkdir tmp/386
cp /386/9pcf tmp/386 cp /386/9pc tmp/386
echo 'bootfile=/386/9pcf' >tmp/plan9.ini echo 'bootfile=/386/9pc' >tmp/plan9.ini
dd -if /dev/zero -of $target -bs 512 -count 32768 dd -if /dev/zero -of $target -bs 512 -count 32768
disk/partfs -m /n/$target $target disk/partfs -m /n/$target $target
disk=/n/$target/sdXX disk=/n/$target/sdXX