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/splash.png b/bootloaders/boot/grub/splash.png deleted file mode 100644 index afbe78d0..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..1aa40be4 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 acc2344e..000ab764 100644 --- a/bootloaders/isolinux/recovery.cfg +++ b/bootloaders/isolinux/recovery.cfg @@ -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/splash800x600.png b/bootloaders/isolinux/splash800x600.png new file mode 100644 index 00000000..e31e0296 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 diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/config.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/config.cfg index d0f16103..1061be0f 100644 --- a/my-distro-devuan-32-pae/bootloaders/boot/grub/config.cfg +++ b/my-distro-devuan-32-pae/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/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg index e27ca6fa..cd134fff 100644 --- a/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg +++ b/my-distro-devuan-32-pae/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/my-distro-devuan-32-pae/bootloaders/boot/grub/splash.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/splash.png deleted file mode 100644 index 59b84691..00000000 Binary files a/my-distro-devuan-32-pae/bootloaders/boot/grub/splash.png and /dev/null differ diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/splash.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/splash.png new file mode 120000 index 00000000..fc3c9053 --- /dev/null +++ b/my-distro-devuan-32-pae/bootloaders/boot/grub/splash.png @@ -0,0 +1 @@ +../../isolinux/splash800x600.png \ No newline at end of file diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/theme.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/theme.cfg index 56e4c18f..fb4d5ef7 100644 --- a/my-distro-devuan-32-pae/bootloaders/boot/grub/theme.cfg +++ b/my-distro-devuan-32-pae/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/my-distro-devuan-32-pae/bootloaders/boot/grub/unicode.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/unicode.pf2 new file mode 100644 index 00000000..290ddc05 Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/boot/grub/unicode.pf2 differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/live.cfg b/my-distro-devuan-32-pae/bootloaders/isolinux/live.cfg index 6543ddfd..1aa40be4 100644 --- a/my-distro-devuan-32-pae/bootloaders/isolinux/live.cfg +++ b/my-distro-devuan-32-pae/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/my-distro-devuan-32-pae/bootloaders/isolinux/recovery.cfg b/my-distro-devuan-32-pae/bootloaders/isolinux/recovery.cfg index bb2d384f..000ab764 100644 --- a/my-distro-devuan-32-pae/bootloaders/isolinux/recovery.cfg +++ b/my-distro-devuan-32-pae/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/my-distro-devuan-32-pae/bootloaders/isolinux/splash800x600.png b/my-distro-devuan-32-pae/bootloaders/isolinux/splash800x600.png new file mode 100644 index 00000000..58589f3e Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/isolinux/splash800x600.png differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/utilities.cfg b/my-distro-devuan-32-pae/bootloaders/isolinux/utilities.cfg index 35c3f6c7..f90939ec 100644 --- a/my-distro-devuan-32-pae/bootloaders/isolinux/utilities.cfg +++ b/my-distro-devuan-32-pae/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 diff --git a/my-distro-devuan-32/bootloaders/boot/grub/config.cfg b/my-distro-devuan-32/bootloaders/boot/grub/config.cfg index d0f16103..1061be0f 100644 --- a/my-distro-devuan-32/bootloaders/boot/grub/config.cfg +++ b/my-distro-devuan-32/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/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg b/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg index e27ca6fa..cd134fff 100644 --- a/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg +++ b/my-distro-devuan-32/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/my-distro-devuan-32/bootloaders/boot/grub/splash.png b/my-distro-devuan-32/bootloaders/boot/grub/splash.png deleted file mode 100644 index 59b84691..00000000 Binary files a/my-distro-devuan-32/bootloaders/boot/grub/splash.png and /dev/null differ diff --git a/my-distro-devuan-32/bootloaders/boot/grub/splash.png b/my-distro-devuan-32/bootloaders/boot/grub/splash.png new file mode 120000 index 00000000..fc3c9053 --- /dev/null +++ b/my-distro-devuan-32/bootloaders/boot/grub/splash.png @@ -0,0 +1 @@ +../../isolinux/splash800x600.png \ No newline at end of file diff --git a/my-distro-devuan-32/bootloaders/boot/grub/theme.cfg b/my-distro-devuan-32/bootloaders/boot/grub/theme.cfg index 56e4c18f..fb4d5ef7 100644 --- a/my-distro-devuan-32/bootloaders/boot/grub/theme.cfg +++ b/my-distro-devuan-32/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/my-distro-devuan-32/bootloaders/boot/grub/unicode.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/unicode.pf2 new file mode 100644 index 00000000..290ddc05 Binary files /dev/null and b/my-distro-devuan-32/bootloaders/boot/grub/unicode.pf2 differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/live.cfg b/my-distro-devuan-32/bootloaders/isolinux/live.cfg index 6543ddfd..1aa40be4 100644 --- a/my-distro-devuan-32/bootloaders/isolinux/live.cfg +++ b/my-distro-devuan-32/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/my-distro-devuan-32/bootloaders/isolinux/recovery.cfg b/my-distro-devuan-32/bootloaders/isolinux/recovery.cfg index bb2d384f..000ab764 100644 --- a/my-distro-devuan-32/bootloaders/isolinux/recovery.cfg +++ b/my-distro-devuan-32/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/my-distro-devuan-32/bootloaders/isolinux/splash800x600.png b/my-distro-devuan-32/bootloaders/isolinux/splash800x600.png new file mode 100644 index 00000000..58589f3e Binary files /dev/null and b/my-distro-devuan-32/bootloaders/isolinux/splash800x600.png differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/utilities.cfg b/my-distro-devuan-32/bootloaders/isolinux/utilities.cfg index 35c3f6c7..f90939ec 100644 --- a/my-distro-devuan-32/bootloaders/isolinux/utilities.cfg +++ b/my-distro-devuan-32/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 diff --git a/my-distro-devuan-64/bootloaders/boot/grub/config.cfg b/my-distro-devuan-64/bootloaders/boot/grub/config.cfg index d0f16103..1061be0f 100644 --- a/my-distro-devuan-64/bootloaders/boot/grub/config.cfg +++ b/my-distro-devuan-64/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/my-distro-devuan-64/bootloaders/boot/grub/grub.cfg b/my-distro-devuan-64/bootloaders/boot/grub/grub.cfg index e27ca6fa..cd134fff 100644 --- a/my-distro-devuan-64/bootloaders/boot/grub/grub.cfg +++ b/my-distro-devuan-64/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/my-distro-devuan-64/bootloaders/boot/grub/splash.png b/my-distro-devuan-64/bootloaders/boot/grub/splash.png deleted file mode 100644 index 59b84691..00000000 Binary files a/my-distro-devuan-64/bootloaders/boot/grub/splash.png and /dev/null differ diff --git a/my-distro-devuan-64/bootloaders/boot/grub/splash.png b/my-distro-devuan-64/bootloaders/boot/grub/splash.png new file mode 120000 index 00000000..fc3c9053 --- /dev/null +++ b/my-distro-devuan-64/bootloaders/boot/grub/splash.png @@ -0,0 +1 @@ +../../isolinux/splash800x600.png \ No newline at end of file diff --git a/my-distro-devuan-64/bootloaders/boot/grub/theme.cfg b/my-distro-devuan-64/bootloaders/boot/grub/theme.cfg index 56e4c18f..fb4d5ef7 100644 --- a/my-distro-devuan-64/bootloaders/boot/grub/theme.cfg +++ b/my-distro-devuan-64/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/my-distro-devuan-64/bootloaders/boot/grub/unicode.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/unicode.pf2 new file mode 100644 index 00000000..290ddc05 Binary files /dev/null and b/my-distro-devuan-64/bootloaders/boot/grub/unicode.pf2 differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/live.cfg b/my-distro-devuan-64/bootloaders/isolinux/live.cfg index 6543ddfd..1aa40be4 100644 --- a/my-distro-devuan-64/bootloaders/isolinux/live.cfg +++ b/my-distro-devuan-64/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/my-distro-devuan-64/bootloaders/isolinux/recovery.cfg b/my-distro-devuan-64/bootloaders/isolinux/recovery.cfg index bb2d384f..000ab764 100644 --- a/my-distro-devuan-64/bootloaders/isolinux/recovery.cfg +++ b/my-distro-devuan-64/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/my-distro-devuan-64/bootloaders/isolinux/splash800x600.png b/my-distro-devuan-64/bootloaders/isolinux/splash800x600.png new file mode 100644 index 00000000..58589f3e Binary files /dev/null and b/my-distro-devuan-64/bootloaders/isolinux/splash800x600.png differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/utilities.cfg b/my-distro-devuan-64/bootloaders/isolinux/utilities.cfg index 35c3f6c7..f90939ec 100644 --- a/my-distro-devuan-64/bootloaders/isolinux/utilities.cfg +++ b/my-distro-devuan-64/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 diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/config.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/config.cfg index d0f16103..1061be0f 100644 --- a/my-distro-ubuntu-64/bootloaders/boot/grub/config.cfg +++ b/my-distro-ubuntu-64/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/my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg index e27ca6fa..23fef90b 100644 --- a/my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg +++ b/my-distro-ubuntu-64/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 -#} +### Commented out till to ram 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 "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/my-distro-ubuntu-64/bootloaders/boot/grub/splash.png b/my-distro-ubuntu-64/bootloaders/boot/grub/splash.png deleted file mode 100644 index cc4e08f1..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/splash.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/splash.png b/my-distro-ubuntu-64/bootloaders/boot/grub/splash.png new file mode 120000 index 00000000..fc3c9053 --- /dev/null +++ b/my-distro-ubuntu-64/bootloaders/boot/grub/splash.png @@ -0,0 +1 @@ +../../isolinux/splash800x600.png \ No newline at end of file diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/theme.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/theme.cfg index 56e4c18f..fb4d5ef7 100644 --- a/my-distro-ubuntu-64/bootloaders/boot/grub/theme.cfg +++ b/my-distro-ubuntu-64/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/my-distro-ubuntu-64/bootloaders/boot/grub/unicode.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/unicode.pf2 new file mode 100644 index 00000000..290ddc05 Binary files /dev/null and b/my-distro-ubuntu-64/bootloaders/boot/grub/unicode.pf2 differ diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/live.cfg b/my-distro-ubuntu-64/bootloaders/isolinux/live.cfg index 6543ddfd..eb7814ce 100644 --- a/my-distro-ubuntu-64/bootloaders/isolinux/live.cfg +++ b/my-distro-ubuntu-64/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 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 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 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 diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/recovery.cfg b/my-distro-ubuntu-64/bootloaders/isolinux/recovery.cfg index bb2d384f..f0dfb389 100644 --- a/my-distro-ubuntu-64/bootloaders/isolinux/recovery.cfg +++ b/my-distro-ubuntu-64/bootloaders/isolinux/recovery.cfg @@ -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/my-distro-ubuntu-64/bootloaders/isolinux/splash800x600.png b/my-distro-ubuntu-64/bootloaders/isolinux/splash800x600.png new file mode 100644 index 00000000..5528cf99 Binary files /dev/null and b/my-distro-ubuntu-64/bootloaders/isolinux/splash800x600.png differ diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/utilities.cfg b/my-distro-ubuntu-64/bootloaders/isolinux/utilities.cfg index 35c3f6c7..cec523d8 100644 --- a/my-distro-ubuntu-64/bootloaders/isolinux/utilities.cfg +++ b/my-distro-ubuntu-64/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 Live failsafe) linux /live/vmlinuz initrd /live/initrd.img append boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788