diff --git a/byondvm/busybox.config b/byondvm/busybox.config index add3b20..5025b10 100644 --- a/byondvm/busybox.config +++ b/byondvm/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.36.1 -# Fri Jun 21 20:59:07 2024 +# Sat Jun 22 18:39:46 2024 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/byondvm/kernel.config b/byondvm/kernel.config index 430bbc7..3bb9884 100644 --- a/byondvm/kernel.config +++ b/byondvm/kernel.config @@ -29,7 +29,7 @@ CONFIG_MPENTIUMIII=y # CONFIG_X86_UMIP is not set # CONFIG_RELOCATABLE is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS1 HOME=/root" +CONFIG_CMDLINE="console=hvc1 HOME=/root" # CONFIG_MODIFY_LDT_SYSCALL is not set # CONFIG_CPU_MITIGATIONS is not set # CONFIG_SUSPEND is not set @@ -64,7 +64,6 @@ CONFIG_INPUT_FF_MEMLESS=y # CONFIG_SERIO_I8042 is not set # CONFIG_SERIO_SERPORT is not set # CONFIG_VT is not set -# CONFIG_UNIX98_PTYS is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_TIOCSTI is not set # CONFIG_LDISC_AUTOLOAD is not set @@ -75,6 +74,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_NONSTANDARD=y +CONFIG_VIRTIO_CONSOLE=y # CONFIG_HW_RANDOM is not set # CONFIG_DEVMEM is not set # CONFIG_DEVPORT is not set diff --git a/package/byondvm-controller/byondvm-controller.hash b/package/byondvm-controller/byondvm-controller.hash deleted file mode 100644 index 394cd76..0000000 --- a/package/byondvm-controller/byondvm-controller.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 d09600274ffdbbf620f31ebfa78e8d9c57f27ae46925ba2ff107580d13fcec33 byondvm-controller-v1.1.1.tar.gz diff --git a/package/byondvm-controller/byondvm-controller.mk b/package/byondvm-controller/byondvm-controller.mk index 55aeae1..efd4bf7 100644 --- a/package/byondvm-controller/byondvm-controller.mk +++ b/package/byondvm-controller/byondvm-controller.mk @@ -4,7 +4,7 @@ # ################################################################################ -BYONDVM_CONTROLLER_VERSION = v1.1.1 +BYONDVM_CONTROLLER_VERSION = v2.0.0 BYONDVM_CONTROLLER_SITE = $(call github,spacestation13,dm-playground_controller,$(BYONDVM_CONTROLLER_VERSION)) BYONDVM_CONTROLLER_LICENSE = ISC diff --git a/rootfs_overlay/etc/inittab b/rootfs_overlay/etc/inittab index 344c56c..abecf61 100644 --- a/rootfs_overlay/etc/inittab +++ b/rootfs_overlay/etc/inittab @@ -34,8 +34,8 @@ null::sysinit:/bin/setserial /dev/ttyS0 sak ::sysinit:/etc/init.d/rcS #run controller -::respawn:/usr/bin/controller +::respawn:/usr/bin/controller /dev/hvc2 -# Auto-login as root on ttyS0 -::respawn:/sbin/getty ttyS0 38400 xterm -n -l /bin/sh +# Auto-login as root on hvc0 +::respawn:/sbin/getty hvc0 38400 xterm -n -l /bin/sh