Wprowadzono podział architektury dla plików rozruchowych

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 (file)
index 0000000..48be6f2
Binary files /dev/null and b/grub/i386/font.pf2 differ

diff --git a/grub/i386/grub.cfg b/grub/i386/grub.cfg
new file mode 100644 (file)
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 (file)
index 0000000..f66ec3d
Binary files /dev/null and b/isolinux/i386/black_screen.png differ

diff --git a/isolinux/i386/isolinux.cfg b/isolinux/i386/isolinux.cfg
new file mode 100644 (file)
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