From 537978796745d8a4e311d577fe43febc82805773 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Wed, 2 Sep 2020 10:31:39 +0200 Subject: [PATCH] Only enter graphical terminal mode for menu --- Makefile | 2 +- limine.bin | Bin 32768 -> 32768 bytes src/lib/term.c | 2 ++ src/main.c | 21 +++++++-------------- src/menu.c | 20 ++++++++++++++------ 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 33d055d5..5528fa63 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ echfs-test: test.img all echfs-utils -m -p0 test.img import test/test.elf boot/test.elf echfs-utils -m -p0 test.img import test/limine.cfg limine.cfg ./limine-install src/limine.bin test.img - qemu-system-x86_64 -hda test.img -debugcon stdio + qemu-system-x86_64 -hda test.img -debugcon stdio -enable-kvm ext2-test: test.img all $(MAKE) -C test diff --git a/limine.bin b/limine.bin index c0cbc09cdb3a589ce4c27e869d74563eb258c5c5..90577a52d3645df10a7adbbba872897e7f4d563b 100644 GIT binary patch delta 8452 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 SpAQlrRcM8eFf1qOvN0 delta 8353 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 "); gets(cmdline, cmdline, CMDLINE_MAX); clear(true); + term_textmode(); return cmdline; } }