Skip to content

Commit

Permalink
Merge pull request #281 from Dennisbonke/mb2
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennisbonke authored Oct 30, 2023
2 parents 9f6dd6b + 4620a76 commit d6a0b59
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions scripts/grub.cfg
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@

menuentry "managarm (Weston, e9 output, 1024x768, plainfb)" {
search.fs_uuid @ROOT_UUID@ root
multiboot /boot/managarm/eir-mb1 bochs init.launch=weston plainfb.force=1
module /boot/managarm/thor
module /boot/managarm/initrd.cpio
multiboot2 /boot/managarm/eir-mb2 bochs init.launch=weston plainfb.force=1
module2 /boot/managarm/thor
module2 /boot/managarm/initrd.cpio
set gfxpayload="1024x768x32"
}

menuentry "managarm (kmscon, e9 output, 1024x768, plainfb)" {
search.fs_uuid @ROOT_UUID@ root
multiboot /boot/managarm/eir-mb1 bochs init.launch=kmscon plainfb.force=1
module /boot/managarm/thor
module /boot/managarm/initrd.cpio
multiboot2 /boot/managarm/eir-mb2 bochs init.launch=kmscon plainfb.force=1
module2 /boot/managarm/thor
module2 /boot/managarm/initrd.cpio
set gfxpayload="1024x768x32"
}

menuentry "managarm (Weston, e9 output, 1024x768)" {
search.fs_uuid @ROOT_UUID@ root
multiboot /boot/managarm/eir-mb1 bochs init.launch=weston
module /boot/managarm/thor
module /boot/managarm/initrd.cpio
multiboot2 /boot/managarm/eir-mb2 bochs init.launch=weston
module2 /boot/managarm/thor
module2 /boot/managarm/initrd.cpio
set gfxpayload="1024x768x32"
}

menuentry "managarm (kmscon, e9 output, 1024x768)" {
search.fs_uuid @ROOT_UUID@ root
multiboot /boot/managarm/eir-mb1 bochs init.launch=kmscon
module /boot/managarm/thor
module /boot/managarm/initrd.cpio
multiboot2 /boot/managarm/eir-mb2 bochs init.launch=kmscon
module2 /boot/managarm/thor
module2 /boot/managarm/initrd.cpio
set gfxpayload="1024x768x32"
}

menuentry "managarm (development: profiling)" {
search.fs_uuid @ROOT_UUID@ root
multiboot /boot/managarm/eir-mb1 bochs init.launch=weston plainfb.force=1 kernel-profile
module /boot/managarm/thor
module /boot/managarm/initrd.cpio
multiboot2 /boot/managarm/eir-mb2 bochs init.launch=weston plainfb.force=1 kernel-profile
module2 /boot/managarm/thor
module2 /boot/managarm/initrd.cpio
set gfxpayload="1024x768x32"
}

menuentry "managarm (sway, e9 output, 1024x768)" {
search.fs_uuid @ROOT_UUID@ root
multiboot /boot/managarm/eir-mb1 bochs init.launch=sway
module /boot/managarm/thor
module /boot/managarm/initrd.cpio
multiboot2 /boot/managarm/eir-mb2 bochs init.launch=sway
module2 /boot/managarm/thor
module2 /boot/managarm/initrd.cpio
set gfxpayload="1024x768x32"
}

0 comments on commit d6a0b59

Please sign in to comment.