JehanneOS/jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

kernel/boot: #ec/console (from kernel args) defines the console to start

Browse Source
This commit is contained in:
Giacomo Tesio
2017-02-04 01:04:51 +01:00
parent 19bf511603
commit 1f59502bf5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sys/src/kern/boot/boot.c
View File

@@ -55,9 +55,14 @@ boot(int argc, char *argv[])
/* /*
* start /dev/cons * start /dev/cons
*/ */
if(startconsole() < 0) if(readfile("#ec/console", buf, sizeof(cputype)) >= 0
&& strcmp("comconsole", buf) == 0){
if(startcomconsole() < 0) if(startcomconsole() < 0)
fatal("no console found"); fatal("no console found");
} else if(startconsole() < 0){
if(startcomconsole() < 0)
fatal("no console found");
}
/* /*
* init will reinitialize its namespace. * init will reinitialize its namespace.

1
sys/src/kern/boot/bootfs.proto
View File

@@ -32,6 +32,7 @@ cmd
ipconfig 500 sys sys /arch/amd64/cmd/ip/ipconfig ipconfig 500 sys sys /arch/amd64/cmd/ip/ipconfig
hmi hmi
screenconsole 500 sys sys /arch/amd64/cmd/hmi/screenconsole screenconsole 500 sys sys /arch/amd64/cmd/hmi/screenconsole
comconsole 500 sys sys /arch/amd64/cmd/hmi/comconsole
usb usb
usbd 500 sys sys /arch/amd64/cmd/usb/usbd usbd 500 sys sys /arch/amd64/cmd/usb/usbd
disk 500 sys sys /arch/amd64/cmd/usb/disk disk 500 sys sys /arch/amd64/cmd/usb/disk