diff --git a/bootloaders/boot/grub/config.cfg b/bootloaders/boot/grub/config.cfg index d0f16103..1061be0f 100644 --- a/bootloaders/boot/grub/config.cfg +++ b/bootloaders/boot/grub/config.cfg @@ -1,10 +1,24 @@ set default=0 -loadfont $prefix/dejavu-bold-16.pf2 -loadfont $prefix/dejavu-bold-14.pf2 -loadfont $prefix/unicode.pf2 -set gfxmode=auto -insmod all_video +if [ x$feature_default_font_path = xy ] ; then + font=unicode +else + font=$prefix/unicode.pf2 +fi + +# Copied from the netinst image +if loadfont $font ; then + set gfxmode=800x600 + set gfxpayload=keep + insmod efi_gop + insmod efi_uga + insmod video_bochs + insmod video_cirrus +else + set gfxmode=auto + insmod all_video +fi + insmod gfxterm insmod png @@ -12,6 +26,5 @@ source /boot/grub/theme.cfg terminal_output gfxterm -# Uncomment so grub beeps during boot -#insmod play -#play 960 440 1 0 4 440 1 +insmod play +play 960 440 1 0 4 440 1 diff --git a/bootloaders/boot/grub/grub.cfg b/bootloaders/boot/grub/grub.cfg index e27ca6fa..cd134fff 100644 --- a/bootloaders/boot/grub/grub.cfg +++ b/bootloaders/boot/grub/grub.cfg @@ -331,16 +331,16 @@ menuentry "Welsh (cy)" { } } ### Commented out till Persistence is working as expected. -#menuentry "Persistent My-distro" --hotkey=p { -# linux /live/vmlinuz boot=live components username=user hostname=My-distro quiet splash findiso=${iso_path} persistence -# initrd /live/initrd.img -#} +menuentry "Persistent My-distro" --hotkey=p { + linux /live/vmlinuz boot=live components username=user hostname=My-distro quiet splash findiso=${iso_path} persistence + initrd /live/initrd.img +} ### Commented out till toram is working as expected. -#menuentry "My-distro loaded to RAM" --hotkey=t { -# linux /live/vmlinuz boot=live components username=user hostname=My-distro quiet splash findiso=${iso_path} toram -# initrd /live/initrd.img -#} +menuentry "My-distro loaded to RAM" --hotkey=t { + linux /live/vmlinuz boot=live components username=user hostname=My-distro quiet splash findiso=${iso_path} toram + initrd /live/initrd.img +} #menuentry "Developer Desktop" --hotkey=d { # linux /live/vmlinuz boot=local ro root=/dev/sdb126 quiet splash findiso=${iso_path} # initrd /live/initrd.img diff --git a/bootloaders/boot/grub/live-theme/background.png b/bootloaders/boot/grub/live-theme/background.png deleted file mode 100644 index 59b84691..00000000 Binary files a/bootloaders/boot/grub/live-theme/background.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/4MLinux.png b/bootloaders/boot/grub/live-theme/icons/4MLinux.png deleted file mode 100644 index 1c6fe5e2..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/4MLinux.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png b/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png deleted file mode 100644 index 6212a1fa..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png b/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png b/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png b/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png deleted file mode 100644 index 7c41182f..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/android.png b/bootloaders/boot/grub/live-theme/icons/android.png deleted file mode 100644 index dad066f5..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/android.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/anonymous.png b/bootloaders/boot/grub/live-theme/icons/anonymous.png deleted file mode 100644 index 7d165b67..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/anonymous.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/antergos.png b/bootloaders/boot/grub/live-theme/icons/antergos.png deleted file mode 100644 index 32e3a3a3..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/antergos.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/arch.png b/bootloaders/boot/grub/live-theme/icons/arch.png deleted file mode 100644 index f6cd8704..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/arch.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/archlinux.png b/bootloaders/boot/grub/live-theme/icons/archlinux.png deleted file mode 100644 index f6cd8704..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/archlinux.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/arcolinux.png b/bootloaders/boot/grub/live-theme/icons/arcolinux.png deleted file mode 100644 index c5e5e5ea..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/arcolinux.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/artix.png b/bootloaders/boot/grub/live-theme/icons/artix.png deleted file mode 100644 index 0cbeb11c..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/artix.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/bedrock.png b/bootloaders/boot/grub/live-theme/icons/bedrock.png deleted file mode 100644 index 58ff48a8..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/bedrock.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/cancel.png b/bootloaders/boot/grub/live-theme/icons/cancel.png deleted file mode 100644 index fca2ac9d..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/cancel.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/centos.png b/bootloaders/boot/grub/live-theme/icons/centos.png deleted file mode 100644 index 23fe2fa5..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/centos.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/chakra.png b/bootloaders/boot/grub/live-theme/icons/chakra.png deleted file mode 100644 index 6f63a959..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/chakra.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/debian.png b/bootloaders/boot/grub/live-theme/icons/debian.png deleted file mode 100644 index 20bea8c2..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/debian.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/deepin.png b/bootloaders/boot/grub/live-theme/icons/deepin.png deleted file mode 100644 index 61c92fb4..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/deepin.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/devuan.png b/bootloaders/boot/grub/live-theme/icons/devuan.png deleted file mode 100644 index ff654016..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/devuan.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/driver.png b/bootloaders/boot/grub/live-theme/icons/driver.png deleted file mode 100644 index 1621ee7f..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/driver.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/edit.png b/bootloaders/boot/grub/live-theme/icons/edit.png deleted file mode 100644 index 6a43bd99..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/edit.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/efi.png b/bootloaders/boot/grub/live-theme/icons/efi.png deleted file mode 100644 index 4ecf3b98..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/efi.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/elementary.png b/bootloaders/boot/grub/live-theme/icons/elementary.png deleted file mode 100644 index 2840354c..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/elementary.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/endeavouros.png b/bootloaders/boot/grub/live-theme/icons/endeavouros.png deleted file mode 100644 index 6b1e530d..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/endeavouros.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/fedora.png b/bootloaders/boot/grub/live-theme/icons/fedora.png deleted file mode 100644 index 926b56d1..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/fedora.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/find.efi.png b/bootloaders/boot/grub/live-theme/icons/find.efi.png deleted file mode 100644 index 0e32321a..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/find.efi.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/find.none.png b/bootloaders/boot/grub/live-theme/icons/find.none.png deleted file mode 100644 index 87d4d0ec..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/find.none.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/freebsd.png b/bootloaders/boot/grub/live-theme/icons/freebsd.png deleted file mode 100644 index fb9408cf..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/freebsd.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/garuda.png b/bootloaders/boot/grub/live-theme/icons/garuda.png deleted file mode 100644 index f699718a..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/garuda.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/gentoo.png b/bootloaders/boot/grub/live-theme/icons/gentoo.png deleted file mode 100644 index bc0ed705..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/gentoo.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/gnu-linux.png b/bootloaders/boot/grub/live-theme/icons/gnu-linux.png deleted file mode 100644 index 326b6596..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/gnu-linux.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/haiku.png b/bootloaders/boot/grub/live-theme/icons/haiku.png deleted file mode 100644 index ce7f8182..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/haiku.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/help.png b/bootloaders/boot/grub/live-theme/icons/help.png deleted file mode 100644 index d8b5a173..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/help.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/kali.png b/bootloaders/boot/grub/live-theme/icons/kali.png deleted file mode 100644 index 900dc82e..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/kali.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/kaos.png b/bootloaders/boot/grub/live-theme/icons/kaos.png deleted file mode 100644 index 9fd4e891..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/kaos.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/kbd.png b/bootloaders/boot/grub/live-theme/icons/kbd.png deleted file mode 100644 index 6ace3ace..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/kbd.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/korora.png b/bootloaders/boot/grub/live-theme/icons/korora.png deleted file mode 100644 index 456e8764..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/korora.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/kubuntu.png b/bootloaders/boot/grub/live-theme/icons/kubuntu.png deleted file mode 100644 index 7a79ff32..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/kubuntu.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/lang.png b/bootloaders/boot/grub/live-theme/icons/lang.png deleted file mode 100644 index 3c9c1d79..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/lang.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/lfs.png b/bootloaders/boot/grub/live-theme/icons/lfs.png deleted file mode 100644 index 326b6596..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/lfs.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/linux.png b/bootloaders/boot/grub/live-theme/icons/linux.png deleted file mode 100644 index 326b6596..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/linux.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/linuxmint.png b/bootloaders/boot/grub/live-theme/icons/linuxmint.png deleted file mode 100644 index 7d9da816..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/linuxmint.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/lubuntu.png b/bootloaders/boot/grub/live-theme/icons/lubuntu.png deleted file mode 100644 index 057c8e25..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/lubuntu.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/macosx.png b/bootloaders/boot/grub/live-theme/icons/macosx.png deleted file mode 100644 index ea03e779..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/macosx.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/mageia.png b/bootloaders/boot/grub/live-theme/icons/mageia.png deleted file mode 100644 index 79afa761..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/mageia.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/manjaro.png b/bootloaders/boot/grub/live-theme/icons/manjaro.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/manjaro.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/mate.png b/bootloaders/boot/grub/live-theme/icons/mate.png deleted file mode 100644 index b2fc22aa..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/mate.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/memtest.png b/bootloaders/boot/grub/live-theme/icons/memtest.png deleted file mode 100644 index 1621ee7f..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/memtest.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/mx-linux.png b/bootloaders/boot/grub/live-theme/icons/mx-linux.png deleted file mode 100644 index 49f11336..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/mx-linux.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/neon.png b/bootloaders/boot/grub/live-theme/icons/neon.png deleted file mode 100644 index e41906e8..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/neon.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/opensuse.png b/bootloaders/boot/grub/live-theme/icons/opensuse.png deleted file mode 100644 index d844fd5a..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/opensuse.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/parrot.png b/bootloaders/boot/grub/live-theme/icons/parrot.png deleted file mode 100644 index 3333de91..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/parrot.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/pop-os.png b/bootloaders/boot/grub/live-theme/icons/pop-os.png deleted file mode 100644 index 014d9f32..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/pop-os.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/pop.png b/bootloaders/boot/grub/live-theme/icons/pop.png deleted file mode 100644 index 014d9f32..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/pop.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/recovery.png b/bootloaders/boot/grub/live-theme/icons/recovery.png deleted file mode 100644 index 7b69b142..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/recovery.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/regolith.png b/bootloaders/boot/grub/live-theme/icons/regolith.png deleted file mode 100644 index 5ece07ba..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/regolith.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/restart.png b/bootloaders/boot/grub/live-theme/icons/restart.png deleted file mode 100644 index 97153021..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/restart.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/rocky.png b/bootloaders/boot/grub/live-theme/icons/rocky.png deleted file mode 100644 index be144f6d..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/rocky.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/shutdown.png b/bootloaders/boot/grub/live-theme/icons/shutdown.png deleted file mode 100644 index fc9cf16b..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/shutdown.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/siduction.png b/bootloaders/boot/grub/live-theme/icons/siduction.png deleted file mode 100644 index d16549bc..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/siduction.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/slackware.png b/bootloaders/boot/grub/live-theme/icons/slackware.png deleted file mode 100644 index 4c31a3f5..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/slackware.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/solus.png b/bootloaders/boot/grub/live-theme/icons/solus.png deleted file mode 100644 index 338718b3..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/solus.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/steamos.png b/bootloaders/boot/grub/live-theme/icons/steamos.png deleted file mode 100644 index df28bccc..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/steamos.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/type.png b/bootloaders/boot/grub/live-theme/icons/type.png deleted file mode 100644 index 5c48476d..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/type.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/tz.png b/bootloaders/boot/grub/live-theme/icons/tz.png deleted file mode 100644 index 220b29b1..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/tz.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/ubuntu.png b/bootloaders/boot/grub/live-theme/icons/ubuntu.png deleted file mode 100644 index 352fbe08..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/ubuntu.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/unknown.png b/bootloaders/boot/grub/live-theme/icons/unknown.png deleted file mode 100644 index 326b6596..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/unknown.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/unset.png b/bootloaders/boot/grub/live-theme/icons/unset.png deleted file mode 100644 index 15e3d3cb..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/unset.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/ventoy.png b/bootloaders/boot/grub/live-theme/icons/ventoy.png deleted file mode 100644 index 7abdc6c4..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/ventoy.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/void.png b/bootloaders/boot/grub/live-theme/icons/void.png deleted file mode 100644 index 01cc2f3a..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/void.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/windows.png b/bootloaders/boot/grub/live-theme/icons/windows.png deleted file mode 100644 index d5c7cc34..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/windows.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/windows11.png b/bootloaders/boot/grub/live-theme/icons/windows11.png deleted file mode 100644 index fe97d9f7..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/windows11.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/xero.png b/bootloaders/boot/grub/live-theme/icons/xero.png deleted file mode 100644 index 2221c73d..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/xero.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/xerolinux.png b/bootloaders/boot/grub/live-theme/icons/xerolinux.png deleted file mode 100644 index 2221c73d..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/xerolinux.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/xubuntu.png b/bootloaders/boot/grub/live-theme/icons/xubuntu.png deleted file mode 100644 index f43abc7b..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/xubuntu.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/icons/zorin.png b/bootloaders/boot/grub/live-theme/icons/zorin.png deleted file mode 100644 index c1506c44..00000000 Binary files a/bootloaders/boot/grub/live-theme/icons/zorin.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/select_c.png b/bootloaders/boot/grub/live-theme/select_c.png deleted file mode 100644 index b1f8d580..00000000 Binary files a/bootloaders/boot/grub/live-theme/select_c.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/select_e.png b/bootloaders/boot/grub/live-theme/select_e.png deleted file mode 100644 index 93323686..00000000 Binary files a/bootloaders/boot/grub/live-theme/select_e.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/select_w.png b/bootloaders/boot/grub/live-theme/select_w.png deleted file mode 100644 index 28f6424e..00000000 Binary files a/bootloaders/boot/grub/live-theme/select_w.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminal_box_c.png b/bootloaders/boot/grub/live-theme/terminal_box_c.png deleted file mode 100644 index d0dd52a2..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminal_box_c.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminal_box_e.png b/bootloaders/boot/grub/live-theme/terminal_box_e.png deleted file mode 100644 index 394cbe4f..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminal_box_e.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminal_box_n.png b/bootloaders/boot/grub/live-theme/terminal_box_n.png deleted file mode 100644 index 476f8bc6..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminal_box_n.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminal_box_ne.png b/bootloaders/boot/grub/live-theme/terminal_box_ne.png deleted file mode 100644 index 9e26959b..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminal_box_ne.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminal_box_nw.png b/bootloaders/boot/grub/live-theme/terminal_box_nw.png deleted file mode 100644 index 5c3cba87..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminal_box_nw.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminal_box_s.png b/bootloaders/boot/grub/live-theme/terminal_box_s.png deleted file mode 100644 index 85a8901d..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminal_box_s.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminal_box_se.png b/bootloaders/boot/grub/live-theme/terminal_box_se.png deleted file mode 100644 index d8627ee5..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminal_box_se.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminal_box_sw.png b/bootloaders/boot/grub/live-theme/terminal_box_sw.png deleted file mode 100644 index 67c600c8..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminal_box_sw.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminal_box_w.png b/bootloaders/boot/grub/live-theme/terminal_box_w.png deleted file mode 100644 index d066e2db..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminal_box_w.png and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminus-12.pf2 b/bootloaders/boot/grub/live-theme/terminus-12.pf2 deleted file mode 100644 index 60920353..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminus-12.pf2 and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminus-14.pf2 b/bootloaders/boot/grub/live-theme/terminus-14.pf2 deleted file mode 100644 index 8ab8bd10..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminus-14.pf2 and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminus-16.pf2 b/bootloaders/boot/grub/live-theme/terminus-16.pf2 deleted file mode 100644 index 6e6b25d3..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminus-16.pf2 and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/terminus-18.pf2 b/bootloaders/boot/grub/live-theme/terminus-18.pf2 deleted file mode 100644 index 129cef14..00000000 Binary files a/bootloaders/boot/grub/live-theme/terminus-18.pf2 and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/theme.txt b/bootloaders/boot/grub/live-theme/theme.txt deleted file mode 100644 index 3f26eea5..00000000 --- a/bootloaders/boot/grub/live-theme/theme.txt +++ /dev/null @@ -1,42 +0,0 @@ -# Main options -title-text: "" -desktop-image: "background.png" -desktop-color: "#000000" -terminal-font: "Terminus Regular 14" -terminal-box: "terminal_box_*.png" -terminal-left: "0" -terminal-top: "0" -terminal-width: "100%" -terminal-height: "100%" -terminal-border: "0" - -# Boot menu -+ boot_menu { - left = 15% - top = 40% - width = 60% - height = 65% - item_font = "Ubuntu Regular 20" - item_color = "#cccccc" - selected_item_color = "#ffffff" - icon_width = 36 - icon_height = 36 - item_icon_space = 20 - item_height = 40 - item_padding = 2 - item_spacing = 10 - selected_item_pixmap_style = "select_*.png" -} - - -# Countdown label -# You can change the name of default starting OS here -+ label { - left = 15% - top = 31% - align = "center" - id = "__timeout__" - text = "My-distro will start in %d seconds" - color = "#cccccc" - font = "Ubuntu Regular 17" -} diff --git a/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 b/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 deleted file mode 100644 index 9405954e..00000000 Binary files a/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 and /dev/null differ diff --git a/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 b/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 deleted file mode 100644 index 3d903bae..00000000 Binary files a/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 and /dev/null differ diff --git a/bootloaders/boot/grub/splash.png b/bootloaders/boot/grub/splash.png deleted file mode 100644 index 59b84691..00000000 Binary files a/bootloaders/boot/grub/splash.png and /dev/null differ diff --git a/bootloaders/boot/grub/splash.png b/bootloaders/boot/grub/splash.png new file mode 120000 index 00000000..fc3c9053 --- /dev/null +++ b/bootloaders/boot/grub/splash.png @@ -0,0 +1 @@ +../../isolinux/splash800x600.png \ No newline at end of file diff --git a/bootloaders/boot/grub/theme.cfg b/bootloaders/boot/grub/theme.cfg index 56e4c18f..fb4d5ef7 100644 --- a/bootloaders/boot/grub/theme.cfg +++ b/bootloaders/boot/grub/theme.cfg @@ -8,6 +8,6 @@ if [ -e /isolinux/splash.png ]; then elif [ -e /boot/grub/splash.png ]; then set theme=/boot/grub/live-theme/theme.txt else - set menu_color_normal=white/red - set menu_color_highlight=white/red + set menu_color_normal=cyan/blue + set menu_color_highlight=white/blue fi diff --git a/bootloaders/boot/grub/unicode.pf2 b/bootloaders/boot/grub/unicode.pf2 new file mode 100644 index 00000000..290ddc05 Binary files /dev/null and b/bootloaders/boot/grub/unicode.pf2 differ diff --git a/bootloaders/isolinux/live.cfg b/bootloaders/isolinux/live.cfg index 6543ddfd..a91459c0 100644 --- a/bootloaders/isolinux/live.cfg +++ b/bootloaders/isolinux/live.cfg @@ -6,7 +6,7 @@ menu title My-distro - Live default live label live - menu label ^My-distro (amd64) + menu label ^My-distro Live linux /live/vmlinuz initrd /live/initrd.img append boot=live components username=user hostname=My-distro splash quiet @@ -395,17 +395,17 @@ LABEL Welsh (cy) ### Until this isn't UNPLEASANT, it stays commented in Beta releases. -#label persistent -# menu label ^Persistent My-distro(amd64) -# linux /live/vmlinuz -# initrd /live/initrd.img -# append boot=live components username=user hostname=My-distro quiet splash persistence - -#label toram -# menu label ^My-distroloaded in RAM -# linux /live/vmlinuz -# initrd /live/initrd.img -# append boot=live components username=user hostname=My-distro quiet splash toram +label persistent + menu label ^Persistent My-distro + linux /live/vmlinuz + initrd /live/initrd.img append boot=live components username=user hostname=My-distro quiet splash persistence + + +label to ram + menu label ^My-distro loaded in RAM + linux /live/vmlinuz + initrd /live/initrd.img + append boot=live components username=user hostname=My-distro quiet splash toram #label developer # menu label ^Boot to Developer Desktop @@ -416,7 +416,7 @@ LABEL Welsh (cy) #### ### ## # This line is intentionaly left blank. # ## ### #### ### By following the constucts above, We can add additional entries #label Alternative boot -# menu label ^Alternative My-distro(amd64) +# menu label ^Alternative My-distro # linux /live/vmlinuz # initrd /live/initrd.img # append boot=live components username=user hostname=My-distro quiet splash persistence @@ -424,7 +424,7 @@ LABEL Welsh (cy) #### ### ## # This line is intentionaly left blank. # ## ### #### ### By following the constucts above, We can add additional entries #label Alternative boot -# menu label ^Alternative My-distro(amd64) +# menu label ^Alternative My-distro # linux /live/vmlinuz # initrd /live/initrd.img # append boot=live components username=user hostname=My-distro quiet splash persistence diff --git a/bootloaders/isolinux/recovery.cfg b/bootloaders/isolinux/recovery.cfg index bb2d384f..000ab764 100644 --- a/bootloaders/isolinux/recovery.cfg +++ b/bootloaders/isolinux/recovery.cfg @@ -1,6 +1,6 @@ ### recovery.cfg for Live-Session include stdmenu.cfg -menu title My-distroRecovery Options +menu title My-distro Recovery Options label R-sda2 menu label ^My-distro on sda2 @@ -41,14 +41,14 @@ label R-mmcblk0p3 #### ### ## # This line is intentionaly left blank. # ## ### #### ### By following the constucts above, We can add additional entries #label Alternative boot -# menu label ^Alternative My-distro(amd64) +# menu label ^Alternative My-distro # linux /live/vmlinuz # initrd /live/initrd.img # append boot=live components quiet splash persistence # say Now booting alternative method ### By following the constucts above, We can add additional entries #label Alternative boot -# menu label ^Alternative My-distro(amd64) +# menu label ^Alternative My-distro # linux /live/vmlinuz # initrd /live/initrd.img # append boot=live components quiet splash persistence diff --git a/bootloaders/isolinux/splash.png b/bootloaders/isolinux/splash.png index 59b84691..09b6ed9b 100644 Binary files a/bootloaders/isolinux/splash.png and b/bootloaders/isolinux/splash.png differ diff --git a/bootloaders/isolinux/splash800x600.png b/bootloaders/isolinux/splash800x600.png new file mode 100644 index 00000000..58589f3e Binary files /dev/null and b/bootloaders/isolinux/splash800x600.png differ diff --git a/bootloaders/isolinux/utilities.cfg b/bootloaders/isolinux/utilities.cfg index 35c3f6c7..f90939ec 100644 --- a/bootloaders/isolinux/utilities.cfg +++ b/bootloaders/isolinux/utilities.cfg @@ -1,7 +1,7 @@ menu title My-distro Utilities Options label failsafe - menu label ^My-distro (amd64 failsafe) + menu label ^My-distro ( failsafe) linux /live/vmlinuz initrd /live/initrd.img append boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788 @@ -12,7 +12,7 @@ label hdt ### By following the constucts above, We can add additional entries #label Alternative boot -# menu label ^Alternative My-distro (amd64) +# menu label ^Alternative My-distro # linux /live/vmlinuz # initrd /live/initrd.img # append boot=live components quiet splash persistence