From bf15bffd02290a82cb114330e8ac5527bea3abc8 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Wed, 29 Nov 2017 17:55:39 +0000 Subject: Update configuration to work with draklive2/grub2. --- config/auto_inst.cfg.pl | 1 + config/live.cfg | 29 ++++++------ files/UEFI/EFI/BOOT/bootx64.efi | Bin 802816 -> 0 bytes files/UEFI/EFI/BOOT/fonts/unicode.pf2 | Bin 2560080 -> 0 bytes files/UEFI/EFI/BOOT/grub.cfg | 47 ------------------- .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 | Bin 3602 -> 0 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 | Bin 4922 -> 0 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 | Bin 6142 -> 0 bytes .../BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 | Bin 4761 -> 0 bytes .../EFI/BOOT/themes/maggy/grub2-mageia-default.png | Bin 178033 -> 0 bytes files/UEFI/EFI/BOOT/themes/maggy/theme.txt | 50 --------------------- 11 files changed, 14 insertions(+), 113 deletions(-) delete mode 100644 files/UEFI/EFI/BOOT/bootx64.efi delete mode 100755 files/UEFI/EFI/BOOT/fonts/unicode.pf2 delete mode 100644 files/UEFI/EFI/BOOT/grub.cfg delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 delete mode 100644 files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/theme.txt diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 6e9bb0c..196046c 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -166,6 +166,7 @@ $o = { # mageia specific 'mageiawelcome', # nice helper app 'mageia-doc-mcc-en', # some nice docs + 'grub2-mageia-theme', # Gnome specific stuff if_($has_gnome, diff --git a/config/live.cfg b/config/live.cfg index e978bb3..105c3d7 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -20,7 +20,6 @@ my $_l = { auto_install => 'config/auto_inst.cfg.pl', install_env => { }, - hide_media_dirs => 0, if_($live->{settings}{default_user}, preselect_kdm_user => $live->{settings}{default_user}), langs_always => [ 'en_US' ], files => [ @@ -133,10 +132,8 @@ my $_l = { ], disable_timers => [ ], + append => "splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0", vga_mode => 788, - gfxboot => 1, - initrd_post => join("\n", - ), postInstall => join(';', if_($live->{settings}{default_user}, "echo $live->{settings}{default_user} > /etc/draklive-install.d/user"), "perl -pi -e 's,,$live->{settings}{default_user},' /etc/draklive-install.d/sysconfig/finish-install", @@ -245,20 +242,20 @@ my $_l = { int => [ map { "i18n-$_" } qw(en) ], }, media => { - storage => 'iso', + storage => 'iso', + source => build_one_label($live), + bootloader_theme => 'maggy', bootloader_timeout => 10, - boot_entries => [ "live" => " xdriver=free", - "live-nf" => " nokmsboot", - "linux" => " install xdriver=free", - "linux-nf" => " install nokmsboot", - ], - source => build_one_label($live), - pre => [ 'for i in seq 1 5; do showlabels --removable | grep ' . build_one_label($live) . '; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ], - extra_modules => [ qw(vfat sd_mod usb_storage ehci_hcd ehci_pci ehci_platform ohci_hcd ohci_pci ohci_platform uhci_hcd xhci_hcd xhci_pci xhci_plat_hcd) ], + bootloader_default => 0, + bootloader_entries => [ 'Boot Mageia Live' => 'xdriver=free', + ' + use non-free video drivers' => 'nokmsboot', + 'Install Mageia Live' => 'install xdriver=free', + ' + use non-free video drivers' => 'install nokmsboot', + ], + #mbr_boot_img => 'files/grub2/boot_hybrid.img', + #eltorito_img => 'files/grub2/eltorito.img', + #bootx64_efi => 'files/grub2/bootx64.efi', files => [ - if_($live->{settings}{arch} eq 'x86_64', - [ 'files/UEFI/EFI', '' ], - ), # FIXME: add doc and autorun #[ 'extra/livecd/autorun/*', ''], #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) diff --git a/files/UEFI/EFI/BOOT/bootx64.efi b/files/UEFI/EFI/BOOT/bootx64.efi deleted file mode 100644 index bb2352c..0000000 Binary files a/files/UEFI/EFI/BOOT/bootx64.efi and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/EFI/BOOT/fonts/unicode.pf2 deleted file mode 100755 index 57b682a..0000000 Binary files a/files/UEFI/EFI/BOOT/fonts/unicode.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/grub.cfg b/files/UEFI/EFI/BOOT/grub.cfg deleted file mode 100644 index 529ca74..0000000 --- a/files/UEFI/EFI/BOOT/grub.cfg +++ /dev/null @@ -1,47 +0,0 @@ - -insmod efi_gop -insmod efi_uga -insmod video_bochs -insmod video_cirrus -insmod video_fb - -insmod font -if loadfont ${prefix}/fonts/unicode.pf2 -then - insmod gfxterm - set gfxmode=1024x768,800x600,auto - set gfxpayload=keep - terminal_output gfxterm -fi - -insmod png -set theme=/EFI/BOOT/themes/maggy/theme.txt -export theme -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 - -set timeout=10 - -search --no-floppy --set=root -l 'VOLUME_LABEL' - -menuentry 'Boot Mageia 6 Live' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free - initrd /boot/cdrom/initrd.gz -} - -menuentry ' + use non-free video drivers (slower to boot)' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot - initrd /boot/cdrom/initrd.gz -} - -menuentry 'Install Mageia 6 Live' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install xdriver=free - initrd /boot/cdrom/initrd.gz -} - -menuentry ' + use non-free video drivers (slower to boot)' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install nokmsboot - initrd /boot/cdrom/initrd.gz -} diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 deleted file mode 100755 index 2fd329b..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 deleted file mode 100755 index 6e619c9..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 deleted file mode 100755 index 605406f..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 deleted file mode 100755 index 5cb52f4..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png b/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png deleted file mode 100644 index df9c862..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/EFI/BOOT/themes/maggy/theme.txt deleted file mode 100755 index 598612f..0000000 --- a/files/UEFI/EFI/BOOT/themes/maggy/theme.txt +++ /dev/null @@ -1,50 +0,0 @@ -# GRUB gfxmenu theme "maggy". - -title-text: "Mageia 6 UEFI" -title-font: "MageiaLogo Bold 28" -title-color: "white" - -desktop-image: "grub2-mageia-default.png" -terminal-font: "Unknown Regular 16" - -+ boot_menu { - left = 5% - top = 15% - width = 75% - height = 55% - item_font = "MageiaLogo Regular 20" - selected_item_font = "MageiaLogo Bold 20" - color_normal="black/black" - item_color = "#0e1a27" - selected_item_color = "white" - item_height = 24 - item_spacing = 10 -} - -+ progress_bar -{ - id = "__timeout__" - left = 20% - top = 70% - width = 60% - height = 2% - fg_color = "lightskyblue" - bg_color = "dodgerblue" - border_color = "midnightblue" -} - -# Informational message bar. -+ vbox { - left = 10% - top = 84%-35 - width = 50% - height = 35 - + label { - text="Select an item with the arrow keys and press Enter to boot." - font="MageiaLogo Bold 16" color="white" - } - + label { - text="Press 'c' for command line, 'e' to edit." - font="MageiaLogo Bold 16" color="white" - } -} -- cgit v1.2.1