From 82395d0d5e74a02c71db8712506ea71953c7de85 Mon Sep 17 00:00:00 2001
From: xf0r3m <jakubstasinski@protonmail.com>
Date: Tue, 5 Sep 2023 18:12:14 +0200
Subject: [PATCH] =?utf8?q?Wprowadzono=20podzia=C5=82=20architektury=20dla?=
 =?utf8?q?=20plik=C3=B3w=20rozruchowych?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 grub/{ => amd64}/font.pf2             | Bin
 grub/{ => amd64}/grub.cfg             |   0
 grub/i386/font.pf2                    | Bin 0 -> 5004 bytes
 grub/i386/grub.cfg                    |  26 ++++++++++++++++++++++++++
 isolinux/{ => amd64}/black_screen.png | Bin
 isolinux/{ => amd64}/isolinux.cfg     |   0
 isolinux/i386/black_screen.png        | Bin 0 -> 1049 bytes
 isolinux/i386/isolinux.cfg            |  26 ++++++++++++++++++++++++++
 8 files changed, 52 insertions(+)
 rename grub/{ => amd64}/font.pf2 (100%)
 rename grub/{ => amd64}/grub.cfg (100%)
 create mode 100644 grub/i386/font.pf2
 create mode 100644 grub/i386/grub.cfg
 rename isolinux/{ => amd64}/black_screen.png (100%)
 rename isolinux/{ => amd64}/isolinux.cfg (100%)
 create mode 100644 isolinux/i386/black_screen.png
 create mode 100644 isolinux/i386/isolinux.cfg

diff --git a/grub/font.pf2 b/grub/amd64/font.pf2
similarity index 100%
rename from grub/font.pf2
rename to grub/amd64/font.pf2
diff --git a/grub/grub.cfg b/grub/amd64/grub.cfg
similarity index 100%
rename from grub/grub.cfg
rename to grub/amd64/grub.cfg
diff --git a/grub/i386/font.pf2 b/grub/i386/font.pf2
new file mode 100644
index 0000000000000000000000000000000000000000..48be6f26fcdac71d25c3df12d7150a2a47323a2c
GIT binary patch
literal 5004
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
aE-Rrjr)!nVN<x*c=CTd;2i40;cj`Y6mw%)H

literal 0
HcmV?d00001

diff --git a/grub/i386/grub.cfg b/grub/i386/grub.cfg
new file mode 100644
index 0000000..0b7d988
--- /dev/null
+++ b/grub/i386/grub.cfg
@@ -0,0 +1,26 @@
+if loadfont $prefix/font.pf2 ; then
+	set gfxmode=800x600
+	set gfxpayload=keep
+	insmod efi_gop
+	insmod efi_uga
+	insmod video_bochs
+	insmod video_cirrcus
+	insmod gfxterm
+	terminal_output gfxterm
+fi
+
+search --set=root --file /GREENOS
+
+set default="0"
+set timeout=30
+set color_highlight=black/green
+set color_normal=green/black
+menuentry "greenOS 2.0 i386 [EFI/GRUB]" {
+	linux ($root)/live/vmlinuz boot=live
+	initrd ($root)/live/initrd
+}
+
+menuentry "greenOS 2.0 i386 [EFI/GRUB] (nomodeset)" {
+	linux ($root)/live/vmlinuz boot=live
+	initrd ($root)/live/initrd
+}
diff --git a/isolinux/black_screen.png b/isolinux/amd64/black_screen.png
similarity index 100%
rename from isolinux/black_screen.png
rename to isolinux/amd64/black_screen.png
diff --git a/isolinux/isolinux.cfg b/isolinux/amd64/isolinux.cfg
similarity index 100%
rename from isolinux/isolinux.cfg
rename to isolinux/amd64/isolinux.cfg
diff --git a/isolinux/i386/black_screen.png b/isolinux/i386/black_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..f66ec3d5247ecc4268c2a94683503f2d20b3e240
GIT binary patch
literal 1049
zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sV0^&A1Qgk|*?TjP;w<opEM{QPQwCwiilz2t
zKtc8rPhVH|ryT5DX8Ifps)T_;k|nMYCC>S|xv6<249-QVi6yBi3gww484B*6z5(Hl
zeBulY%#%G`978H@y*<dt2-MP~@PB=thXaT?3PwX<Gz1191U_U4ZDL>)^H!e;vfR_v
K&t;ucLK6Uh9w;pU

literal 0
HcmV?d00001

diff --git a/isolinux/i386/isolinux.cfg b/isolinux/i386/isolinux.cfg
new file mode 100644
index 0000000..da7ad89
--- /dev/null
+++ b/isolinux/i386/isolinux.cfg
@@ -0,0 +1,26 @@
+UI vesamenu.c32
+
+MENU TITLE greenOS 2.0 (Oak) LiveCD i386
+DEFAULT linux
+TIMEOUT 600
+MENU RESOLUTION 640 480
+MENU BACKGROUND black_screen.png
+MENU COLOR TITLE 1;32;40 #a000fa00 #00000000 std
+MENU COLOR BORDER 32;40	#a000fa00 #00000000 std
+MENU COLOR UNSEL 32;40 #a000fa00 #00000000 std
+MENU COLOR SEL 7;40;32 #ff000000 #a000fa00 std
+MENU COLOR TABMSG 32;40 #a000fa00 #00000000 std
+MENU COLOR TIMEOUT_MSG 32;40 #a000fa00 #00000000 std
+MENU COLOR TIMEOUT 1;37;40 #a0ffffff #00000000 std
+
+LABEL linux
+	MENU LABEL greenOS [BIOS/ISOLINUX]
+	MENU DEFAULT
+	KERNEL /live/vmlinuz
+	APPEND initrd=/live/initrd boot=live
+
+LABEL linux
+	MENU LABEL greenOS [BIOS/ISOLINUX] (nomodeset)
+	MENU DEFAULT
+	KERNEL /live/vmlinuz
+	APPEND initrd=/live/initrd boot=live nomodeset
-- 
2.39.5