From 721652909f30e0b9d2514314720d119e1c1a016c Mon Sep 17 00:00:00 2001
From: Alex <enderice2@users.noreply.github.com>
Date: Thu, 11 May 2023 19:05:26 +0300
Subject: [PATCH] Update configs

---
 Makefile                   |  3 ++-
 initrd/home/default/.shrc  |  0
 initrd/system/bin/.gitkeep |  0
 tools/grub.cfg             | 36 +++++++++++++++++++++++++-----------
 4 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 initrd/home/default/.shrc
 create mode 100644 initrd/system/bin/.gitkeep

diff --git a/Makefile b/Makefile
index f87e4a14..38ba228d 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,7 @@ QEMU_SMP_DBG = -smp 4
 QEMU_SMP = -smp 4
 endif
 
-vscode_debug: build_kernel build_userspace build_drivers build_image
+vscode_debug: build_lynx build_kernel build_userspace build_drivers build_image
 	rm -f serial.log profiler.log memtrk.dmp serial4.dmp network.dmp
 	$(QEMU) -S -gdb tcp::1234 -d int -no-reboot -no-shutdown $(QEMU_UEFI_BIOS) -m 1G $(QEMUFLAGS) $(QEMU_SMP_DBG)
 
@@ -208,6 +208,7 @@ clean:
 	rm -f initrd/system/*.raw
 	rm -f initrd/system/*.so
 	rm -f initrd/system/*.a
+	rm -f initrd/system/bin/*.elf
 	rm -f initrd/system/lib/*.a
 	rm -f initrd/system/lib/*.raw
 	rm -f initrd/system/lib/*.so
diff --git a/initrd/home/default/.shrc b/initrd/home/default/.shrc
new file mode 100644
index 00000000..e69de29b
diff --git a/initrd/system/bin/.gitkeep b/initrd/system/bin/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/tools/grub.cfg b/tools/grub.cfg
index d8bf65f9..da6c311f 100644
--- a/tools/grub.cfg
+++ b/tools/grub.cfg
@@ -1,19 +1,19 @@
 set default=0
-set timeout=5
-# set lang=ro_RO
+set timeout=1
 set menu_color_normal=white/black
 set menu_color_highlight=black/light-gray
 
 menuentry "Fennix" {
-    clear
-    echo "Loading kernel"
+    load_video
+	clear
+	echo "Loading kernel"
 	multiboot2 /kernel.fsys --alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/system/drivers --init=/system/init.elf --ioc=true --udl=true --simd=false --bootanim=false
-    echo "Loading initrd"
-    module2 /initrd.tar.gz initrd
-    echo "Loading bootanim"
-    module2 /bootanim.tar.gz bootanim
-    echo "Booting..."
-    boot
+	echo "Loading initrd"
+	module2 /initrd.tar.gz initrd
+	echo "Loading bootanim"
+	module2 /bootanim.tar.gz bootanim
+	echo "Booting..."
+	boot
 }
 
 menuentry 'Boot from next volume' {
@@ -24,4 +24,18 @@ if [ ${grub_platform} == "efi" ]; then
 	menuentry 'UEFI Firmware Settings' {
 		fwsetup
 	}
-fi
\ No newline at end of file
+fi
+
+function load_video {
+	if [ x$feature_all_video_module = xy ]; then
+		insmod all_video
+	else
+		insmod efi_gop
+		insmod efi_uga
+		insmod ieee1275_fb
+		insmod vbe
+		insmod vga
+		insmod video_bochs
+		insmod video_cirrus
+	fi
+}