diff --git a/bootloaders/grub-pc/config.cfg b/bootloaders/grub-pc/config.cfg index 78b032f0..1061be0f 100644 --- a/bootloaders/grub-pc/config.cfg +++ b/bootloaders/grub-pc/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 diff --git a/bootloaders/grub-pc/dejavu-bold-14.pf2 b/bootloaders/grub-pc/dejavu-bold-14.pf2 deleted file mode 100644 index 9b093b20..00000000 Binary files a/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ diff --git a/bootloaders/grub-pc/dejavu-bold-16.pf2 b/bootloaders/grub-pc/dejavu-bold-16.pf2 deleted file mode 100644 index 11e7f7ab..00000000 Binary files a/bootloaders/grub-pc/dejavu-bold-16.pf2 and /dev/null differ diff --git a/bootloaders/grub-pc/font.pf2 b/bootloaders/grub-pc/font.pf2 deleted file mode 100644 index 59e8ffa6..00000000 Binary files a/bootloaders/grub-pc/font.pf2 and /dev/null differ diff --git a/bootloaders/grub-pc/grub.cfg b/bootloaders/grub-pc/grub.cfg index 37dcd573..10030b80 100644 --- a/bootloaders/grub-pc/grub.cfg +++ b/bootloaders/grub-pc/grub.cfg @@ -1,41 +1,57 @@ source /boot/grub/config.cfg -menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "My-distro Live (fail-safe mode)" { - linux /live/initrd.img boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal +# Live boot +menuentry "My-distro Live)" --hotkey=l { + linux /live/vmlinuz boot=live components quiet splash findiso=${iso_path} initrd /live/initrd.img } -submenu "My-distro Live with Localisation Support" { -menuentry "Portuguese (pt)" { - linux /live/vmlinuz boot=live components locales=pt_PT.UTF-8 quiet splash keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Portuguese (Brazil) (pt_BR)" { - linux /live/vmlinuz boot=live components locales=pt_BR.UTF-8 quiet splash keyboard-layouts=br username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "English (en)" { - linux /live/vmlinuz boot=live components locales=en_US.UTF-8 quiet splash keyboard-layouts=en username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "French (fr)" { - linux /live/vmlinuz boot=live components locales=fr_FR.UTF-8 quiet splash keyboard-layouts=fr username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "German (de)" { - linux /live/vmlinuz boot=live components locales=de_DE.UTF-8 quiet splash keyboard-layouts=de username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Italian (it)" { - linux /live/vmlinuz boot=live components locales=it_IT.UTF-8 quiet splash keyboard-layouts=it username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Spanish (es)" { - linux /live/vmlinuz boot=live components locales=es_ES.UTF-8 quiet splash keyboard-layouts=es username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} +menuentry "vMy-distro Live ( fail-safe mode)" { + linux /live/vmlinuz boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788 + initrd /live/initrd.img } +# You can add more entries like this +# menuentry "Alternate live boot" { +# linux /live/vmlinuz boot=live components quiet splash findiso=${iso_path} custom options here +# initrd /live/initrd.img +# } +# menuentry "Alternate graphical installer" { +# linux /install/gtk/vmlinuz vga=788 --- quiet custom options here +# initrd /install/gtk/initrd.gz +# } +# menuentry "Alternate textual installer" { +# linux /install/vmlinuz vga=normal --- quiet custom options here +# initrd /install/initrd.gz +# } + +# Installer (if any) +if true; then + +source /boot/grub/install_start.cfg + +submenu 'Advanced install options ...' --hotkey=a { + + source /boot/grub/theme.cfg + + source /boot/grub/install.cfg + +} +fi + +submenu 'Utilities...' --hotkey=u { + + source /boot/grub/theme.cfg + + # Memtest (if any) + if false; then + source /boot/grub/memtest.cfg + fi + + # Firmware setup (UEFI) + if [ "${grub_platform}" = "efi" ]; then + menuentry "UEFI Firmware Settings" { + fwsetup + } + fi + +} diff --git a/bootloaders/grub-pc/install.cfg b/bootloaders/grub-pc/install.cfg new file mode 100644 index 00000000..6e6a5171 --- /dev/null +++ b/bootloaders/grub-pc/install.cfg @@ -0,0 +1,124 @@ +submenu 'Graphical installer ...' --hotkey=g { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz priority=low vga=788 + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz auto=true priority=critical vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz rescue/enable=true vga=788 --- quiet + initrd /install/gtk/initrd.gz + } +} + +submenu 'Text installer ...' --hotkey=t { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/vmlinuz vga=788 --- quiet + initrd /install/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/vmlinuz priority=low vga=788 + initrd /install/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/vmlinuz auto=true priority=critical vga=788 --- quiet + initrd /install/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/vmlinuz rescue/enable=true vga=788 --- quiet + initrd /install/initrd.gz + } +} + +submenu 'Graphical installer with dark theme ...' --hotkey=d { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz priority=low vga=788 theme=dark + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz auto=true priority=critical vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz rescue/enable=true vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } +} + +submenu 'Text installer with dark theme ...' --hotkey=k { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/vmlinuz vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/vmlinuz priority=low vga=788 theme=dark + initrd /install/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/vmlinuz auto=true priority=critical vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/vmlinuz rescue/enable=true vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } +} + +submenu 'Installer with speech synthesis ...' --hotkey=s { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz speakup.synth=soft vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz speakup.synth=soft priority=low vga=788 + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz speakup.synth=soft auto=true priority=critical vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz speakup.synth=soft rescue/enable=true vga=788 --- quiet + initrd /install/gtk/initrd.gz + } +} diff --git a/bootloaders/grub-pc/install_start.cfg b/bootloaders/grub-pc/install_start.cfg new file mode 100644 index 00000000..24542254 --- /dev/null +++ b/bootloaders/grub-pc/install_start.cfg @@ -0,0 +1,9 @@ +menuentry 'Start installer' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 --- quiet + initrd /install/gtk/initrd.gz +} + +menuentry 'Start installer with speech synthesis' --hotkey=s { + linux /install/gtk/vmlinuz speakup.synth=soft vga=788 --- quiet + initrd /install/gtk/initrd.gz +} diff --git a/bootloaders/grub-pc/loopback.cfg b/bootloaders/grub-pc/loopback.cfg index b8e3b214..e94c44d2 100644 --- a/bootloaders/grub-pc/loopback.cfg +++ b/bootloaders/grub-pc/loopback.cfg @@ -1 +1 @@ -source /boot/grub/grub.cfg \ No newline at end of file +source /boot/grub/grub.cfg diff --git a/bootloaders/grub-pc/unicode.pf2 b/bootloaders/grub-pc/unicode.pf2 new file mode 100644 index 00000000..290ddc05 Binary files /dev/null and b/bootloaders/grub-pc/unicode.pf2 differ diff --git a/bootloaders/isolinux/chain.c32 b/bootloaders/isolinux/chain.c32 deleted file mode 100644 index a9d6e0ea..00000000 Binary files a/bootloaders/isolinux/chain.c32 and /dev/null differ diff --git a/bootloaders/isolinux/hdt.c32 b/bootloaders/isolinux/hdt.c32 new file mode 100644 index 00000000..d67d918c Binary files /dev/null and b/bootloaders/isolinux/hdt.c32 differ diff --git a/bootloaders/isolinux/install.cfg b/bootloaders/isolinux/install.cfg new file mode 100644 index 00000000..7ad06704 --- /dev/null +++ b/bootloaders/isolinux/install.cfg @@ -0,0 +1,185 @@ +label installstart + menu label Start ^installer + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 --- quiet + +label installstartspeech + menu label Start installer with ^speech synthesis + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft vga=788 --- quiet + +menu begin install + menu label ^Advanced install options + menu title Advanced install options + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + menu begin graphicalinstall + menu label ^Graphical installer + menu title Graphical installer + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label installgui + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 --- quiet + + label expertgui + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append priority=low vga=788 + + label autogui + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append auto=true priority=critical vga=788 --- quiet + + label rescuegui + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append rescue/enable=true vga=788 --- quiet + menu end + + menu begin textinstall + menu label ^Text installer + menu title Text installer + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 --- quiet + + label expert + menu label E^xpert install + linux /install/vmlinuz + initrd /install/initrd.gz + append priority=low vga=788 + + label auto + menu label ^Automated install + linux /install/vmlinuz + initrd /install/initrd.gz + append auto=true priority=critical vga=788 --- quiet + + label rescue + menu label ^Rescue mode + linux /install/vmlinuz + initrd /install/initrd.gz + append rescue/enable=true vga=788 --- quiet + menu end + + menu begin graphicalinstalldark + menu label Graphical installer with ^dark theme + menu title Graphical installer with dark theme + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label darkinstallgui + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 theme=dark --- quiet + + label darkexpertgui + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append priority=low vga=788 theme=dark + + label darkautogui + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append auto=true priority=critical vga=788 theme=dark --- quiet + + label darkrescuegui + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append rescue/enable=true vga=788 theme=dark --- quiet + menu end + + menu begin textinstalldark + menu label Text installer with dar^k theme + menu title Text installer with dark theme + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label darkinstall + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 theme=dark --- quiet + + label darkexpert + menu label E^xpert install + linux /install/vmlinuz + initrd /install/initrd.gz + append priority=low vga=788 theme=dark + + label darkauto + menu label ^Automated install + linux /install/vmlinuz + initrd /install/initrd.gz + append auto=true priority=critical vga=788 theme=dark --- quiet + + label darkrescue + menu label ^Rescue mode + linux /install/vmlinuz + initrd /install/initrd.gz + append rescue/enable=true vga=788 theme=dark --- quiet + menu end + + menu begin speechinstall + menu label Installer with ^speech synthesis + menu title Installer with speech synthesis + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label installspeechsynth + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft vga=788 --- quiet + + label expertguispeech + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft priority=low vga=788 + + label autoguispeech + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft auto=true priority=critical vga=788 --- quiet + + label rescueguispeech + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft rescue/enable=true vga=788 --- quiet + menu end +menu end diff --git a/bootloaders/isolinux/isolinux.cfg b/bootloaders/isolinux/isolinux.cfg index e5d0290d..a3e3eabc 100644 --- a/bootloaders/isolinux/isolinux.cfg +++ b/bootloaders/isolinux/isolinux.cfg @@ -1,6 +1,3 @@ -# D-I config version 2.0 -# search path for the c32 support libraries (libcom32, libutil etc.) -path include menu.cfg default vesamenu.c32 prompt 0 diff --git a/bootloaders/isolinux/ldlinux.c32 b/bootloaders/isolinux/ldlinux.c32 new file mode 100644 index 00000000..e94389bb Binary files /dev/null and b/bootloaders/isolinux/ldlinux.c32 differ diff --git a/bootloaders/isolinux/libcom32.c32 b/bootloaders/isolinux/libcom32.c32 new file mode 100644 index 00000000..c4265b94 Binary files /dev/null and b/bootloaders/isolinux/libcom32.c32 differ diff --git a/bootloaders/isolinux/libgpl.c32 b/bootloaders/isolinux/libgpl.c32 new file mode 100644 index 00000000..11f43f18 Binary files /dev/null and b/bootloaders/isolinux/libgpl.c32 differ diff --git a/bootloaders/isolinux/libmenu.c32 b/bootloaders/isolinux/libmenu.c32 new file mode 100644 index 00000000..b3d69860 Binary files /dev/null and b/bootloaders/isolinux/libmenu.c32 differ diff --git a/bootloaders/isolinux/libutil.c32 b/bootloaders/isolinux/libutil.c32 new file mode 100644 index 00000000..6fc1da7e Binary files /dev/null and b/bootloaders/isolinux/libutil.c32 differ diff --git a/bootloaders/isolinux/live.cfg b/bootloaders/isolinux/live.cfg new file mode 100644 index 00000000..1b1bee0f --- /dev/null +++ b/bootloaders/isolinux/live.cfg @@ -0,0 +1,12 @@ +label My-distro Live + menu label ^Live system (amd64) + menu default + linux /live/vmlinuz + initrd /live/initrd.img + append boot=live components quiet splash + +label My-distro Live-failsafe + menu label Live system (amd64 fail-safe mode) + linux /live/vmlinuz + initrd /live/initrd.img + append boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788 diff --git a/bootloaders/isolinux/live.cfg.in b/bootloaders/isolinux/live.cfg.in deleted file mode 100644 index 97ceb92a..00000000 --- a/bootloaders/isolinux/live.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ -label live-@FLAVOUR@ - menu label ^Live (@FLAVOUR@) - menu default - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE@ - -label live-@FLAVOUR@-failsafe - menu label ^Live (@FLAVOUR@ failsafe) - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE_FAILSAFE@ diff --git a/bootloaders/isolinux/menu.cfg b/bootloaders/isolinux/menu.cfg index 72845759..db4f2629 100644 --- a/bootloaders/isolinux/menu.cfg +++ b/bootloaders/isolinux/menu.cfg @@ -1,61 +1,18 @@ -INCLUDE stdmenu.cfg -MENU title Main Menu -DEFAULT My-distro Live -LABEL My-distro Live - SAY "Booting My-distro Live..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores +menu hshift 0 +menu width 82 -LABEL My-distro live failsafe - menu label My-distro Live failsafe - kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config noapic noapm nodma nomce nolapic pci=nomsi nomodeset radeon.modeset=0 nouveau.modeset=0 nosmp vga=normal autologin +menu title Boot menu +include stdmenu.cfg +include live.cfg +include install.cfg +menu begin utilities + menu label ^Utilities + menu title Utilities + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + include utilities.cfg +menu end -LABEL hd - menu label Boot the first hard disk - COM32 chain.c32 - APPEND hd0 - -MENU begin advanced -MENU title My-distro Live with Localisation Support -LABEL Portuguese (pt) - SAY "Booting Portuguese (pt)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_PT.UTF-8 username=user hostname=My-distro keyboard-layouts=pt quiet splash - -LABEL Portuguese (Brazil) (pt_BR) - SAY "Booting Portuguese (Brazil) (pt_BR)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_BR.UTF-8 username=user hostname=My-distro keyboard-layouts=br quiet splash - -LABEL English (en) - SAY "Booting English (en)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=en_US.UTF-8 username=user hostname=My-distro keyboard-layouts=en quiet splash - -LABEL French (fr) - SAY "Booting French (fr)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=fr_FR.UTF-8 username=user hostname=My-distro keyboard-layouts=fr quiet splash - -LABEL German (de) - SAY "Booting German (de)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=de_DE.UTF-8 username=user hostname=My-distro keyboard-layouts=de quiet splash - -LABEL Italian (it) - SAY "Booting Italian (it)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=it_IT.UTF-8 username=user hostname=My-distro keyboard-layouts=it quiet splash - -LABEL Spanish (es) - SAY "Booting Spanish (es)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=es_ES.UTF-8 username=user hostname=My-distro keyboard-layouts=es quiet splash - - LABEL mainmenu - MENU label Back - MENU exit - MENU end - -INCLUDE utilities.cfg +menu clear diff --git a/bootloaders/isolinux/splash800x600.png b/bootloaders/isolinux/splash800x600.png new file mode 100644 index 00000000..b0552af0 Binary files /dev/null and b/bootloaders/isolinux/splash800x600.png differ diff --git a/bootloaders/isolinux/stdmenu.cfg b/bootloaders/isolinux/stdmenu.cfg index 39134698..671b16f7 100644 --- a/bootloaders/isolinux/stdmenu.cfg +++ b/bootloaders/isolinux/stdmenu.cfg @@ -5,14 +5,10 @@ menu color sel * #ffffffff #76a1d0ff * menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * menu color tabmsg * #ffffffff #00000000 * menu color help 37;40 #ffdddd00 #00000000 none -# XXX When adjusting vshift, take care that rows is set to a small -# enough value so any possible menu will fit on the screen, -# rather than falling off the bottom. -menu vshift 8 -menu rows 8 -# The help line must be at least one line from the bottom. -menu helpmsgrow 14 -# The command line must be at least one line from the help line. +menu vshift 12 +menu rows 10 +menu helpmsgrow 15 +# The command line must be at least one line from the bottom. menu cmdlinerow 16 menu timeoutrow 16 menu tabmsgrow 18 diff --git a/bootloaders/isolinux/vesamenu.c32 b/bootloaders/isolinux/vesamenu.c32 new file mode 100644 index 00000000..bbb65e07 Binary files /dev/null and b/bootloaders/isolinux/vesamenu.c32 differ