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

runners: enable console at kernel command line

Browse Source
This commit is contained in:
Giacomo Tesio 2017-07-31 01:03:22 +02:00
parent 18592a0455
commit 351dbedd8b
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QA.sh
View File

@ -37,7 +37,7 @@ if [ "$CPU_MODEL" = "" ]; then
CPU_MODEL=Opteron_G1 CPU_MODEL=Opteron_G1
fi fi
appendLine="nobootprompt=tcp maxcores=1024 fs=10.0.2.2 auth=10.0.2.2 nvram=/boot/nvram nvrlen=512 nvroff=0 $KAPPEND" appendLine="console=0 nobootprompt=tcp maxcores=1024 fs=10.0.2.2 auth=10.0.2.2 nvram=/boot/nvram nvrlen=512 nvroff=0 $KAPPEND"
appendLine="-append '$appendLine'" appendLine="-append '$appendLine'"
kernelLine="-kernel $KERNEL $*" kernelLine="-kernel $KERNEL $*"
if [ "$DISK" = "" ]; then if [ "$DISK" = "" ]; then

6
disk-setup/syslinux.cfg
View File

@ -7,13 +7,13 @@ DEFAULT menu.c32
LABEL FromUSB LABEL FromUSB
KERNEL mboot.c32 KERNEL mboot.c32
APPEND jehanne.32bit nobootprompt=local!/shr/usb/sdU67d95 maxcores=1024 auth=10.0.0.203 nvram=/shr/usb/sdU67d95/nvram nvrlen=512 nvroff=0 *acpi= --- initrd APPEND jehanne.32bit console=0 nobootprompt=local!/shr/usb/sdU67d95 maxcores=1024 auth=10.0.0.203 nvram=/shr/usb/sdU67d95/nvram nvrlen=512 nvroff=0 *acpi= --- initrd
LABEL FromAHCI LABEL FromAHCI
KERNEL mboot.c32 KERNEL mboot.c32
APPEND jehanne.32bit nobootprompt=local!#S/sdE0 maxcores=1024 auth=10.0.0.1 nvram=#S/sdE0/nvram nvrlen=512 nvroff=0 *acpi= --- initrd APPEND jehanne.32bit console=0 nobootprompt=local!#S/sdE0 maxcores=1024 auth=10.0.0.1 nvram=#S/sdE0/nvram nvrlen=512 nvroff=0 *acpi= --- initrd
LABEL FromIDE LABEL FromIDE
KERNEL mboot.c32 KERNEL mboot.c32
APPEND jehanne.32bit nobootprompt=local!#S/sdC0 maxcores=1024 auth=10.0.0.1 nvram=#S/sdC0/nvram nvrlen=512 nvroff=0 *acpi= --- initrd APPEND jehanne.32bit console=0 nobootprompt=local!#S/sdC0 maxcores=1024 auth=10.0.0.1 nvram=#S/sdC0/nvram nvrlen=512 nvroff=0 *acpi= --- initrd

2
runDisk.sh
View File

@ -4,7 +4,7 @@
# #
# Copyright (C) 2016-2017 Giacomo Tesio <giacomo@tesio.it> # Copyright (C) 2016-2017 Giacomo Tesio <giacomo@tesio.it>
export SDL_VIDEO_X11_DGAMOUSE=0 # see https://wiki.archlinux.org/index.php/QEMU#Mouse_cursor_is_jittery_or_erratic #export SDL_VIDEO_X11_DGAMOUSE=0 # see https://wiki.archlinux.org/index.php/QEMU#Mouse_cursor_is_jittery_or_erratic
if [ "$JEHANNE" = "" ]; then if [ "$JEHANNE" = "" ]; then
echo $0 requires the shell started by ./hacking/devshell.sh echo $0 requires the shell started by ./hacking/devshell.sh

5
runOver9P.sh
View File

@ -1,10 +1,11 @@
#!/bin/sh #!/bin/sh
# This file is part of Jehanne. # This file is part of Jehanne.
# #
# Copyright (C) 2016-2017 Giacomo Tesio <giacomo@tesio.it> # Copyright (C) 2016-2017 Giacomo Tesio <giacomo@tesio.it>
export SDL_VIDEO_X11_DGAMOUSE=0 # see https://wiki.archlinux.org/index.php/QEMU#Mouse_cursor_is_jittery_or_erratic #export SDL_VIDEO_X11_DGAMOUSE=0 # see https://wiki.archlinux.org/index.php/QEMU#Mouse_cursor_is_jittery_or_erratic
if [ "$JEHANNE" = "" ]; then if [ "$JEHANNE" = "" ]; then
echo $0 requires the shell started by ./hacking/devshell.sh echo $0 requires the shell started by ./hacking/devshell.sh
@ -62,7 +63,7 @@ $bootDisk \
-redir tcp:17010::17010 \ -redir tcp:17010::17010 \
-redir tcp:17013::17013 \ -redir tcp:17013::17013 \
$usbDev \ $usbDev \
-append "maxcores=1024 nvram=$NVRAM nvrlen=512 nvroff=0 *acpi= $FS $KAPPEND" \ -append "maxcores=1024 nvram=$NVRAM nvrlen=512 nvroff=0 console=0 *acpi= $FS $KAPPEND" \
-initrd ./initrd \ -initrd ./initrd \
-kernel $KERNEL $* -kernel $KERNEL $*
EOF EOF