diff options
Diffstat (limited to 'files')
19 files changed, 44 insertions, 4 deletions
diff --git a/files/UEFI/EFI/boot/bootx64.efi b/files/UEFI/EFI/boot/bootx64.efi Binary files differdeleted file mode 100644 index ccedcab..0000000 --- a/files/UEFI/EFI/boot/bootx64.efi +++ /dev/null diff --git a/files/UEFI/GNOME/EFI/boot/bootx64.efi b/files/UEFI/GNOME/EFI/boot/bootx64.efi Binary files differnew file mode 100644 index 0000000..c5e1458 --- /dev/null +++ b/files/UEFI/GNOME/EFI/boot/bootx64.efi diff --git a/files/UEFI/GNOME/loader/entries/01-mga-boot.conf b/files/UEFI/GNOME/loader/entries/01-mga-boot.conf new file mode 100644 index 0000000..60f2e47 --- /dev/null +++ b/files/UEFI/GNOME/loader/entries/01-mga-boot.conf @@ -0,0 +1,4 @@ +title Boot Mageia 4 Live +linux /boot/vmlinuz +initrd /boot/cdrom/initrd.gz +options root=mgalive:LABEL=Mageia-4-GNOME-LiveDVD splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 diff --git a/files/UEFI/GNOME/loader/entries/02-mga-install.conf b/files/UEFI/GNOME/loader/entries/02-mga-install.conf new file mode 100644 index 0000000..1abcc7b --- /dev/null +++ b/files/UEFI/GNOME/loader/entries/02-mga-install.conf @@ -0,0 +1,4 @@ +title Install Mageia 4 Live +linux /boot/vmlinuz +initrd /boot/cdrom/initrd.gz +options root=mgalive:LABEL=Mageia-4-GNOME-LiveDVD splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 install diff --git a/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf b/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf new file mode 100644 index 0000000..e3bae9c --- /dev/null +++ b/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf @@ -0,0 +1,4 @@ +title Boot Mageia 4 Live (Safe mode) +linux /boot/vmlinuz +initrd /boot/cdrom/initrd.gz +options root=mgalive:LABEL=Mageia-4-GNOME-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=vesa diff --git a/files/UEFI/loader/entries/01-mga-boot.conf b/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf index 921d663..f70c488 100644 --- a/files/UEFI/loader/entries/01-mga-boot.conf +++ b/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf @@ -1,4 +1,4 @@ -title Boot Mageia 4 Live +title Boot Mageia 4 Live (USB FAT32) linux /boot/vmlinuz initrd /boot/cdrom/initrd.gz options root=mgalive:LABEL=MGA4LIVE UEFI splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 diff --git a/files/UEFI/loader/entries/02-mga-install.conf b/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf index eb7fc47..afd6fce 100644 --- a/files/UEFI/loader/entries/02-mga-install.conf +++ b/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf @@ -1,4 +1,4 @@ -title Install Mageia 4 Live +title Install Mageia 4 Live (USB FAT32) linux /boot/vmlinuz initrd /boot/cdrom/initrd.gz options root=mgalive:LABEL=MGA4LIVE UEFI splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 install diff --git a/files/UEFI/loader/entries/03-mga-boot-safe.conf b/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf index 70efab5..fe45c18 100644 --- a/files/UEFI/loader/entries/03-mga-boot-safe.conf +++ b/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf @@ -1,4 +1,4 @@ -title Boot Mageia 4 Live (Safe mode) +title Boot Mageia 4 Live (USB FAT32, Safe mode) linux /boot/vmlinuz initrd /boot/cdrom/initrd.gz options root=mgalive:LABEL=MGA4LIVE UEFI rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=vesa diff --git a/files/UEFI/loader/loader.conf b/files/UEFI/GNOME/loader/loader.conf index da28360..da28360 100644 --- a/files/UEFI/loader/loader.conf +++ b/files/UEFI/GNOME/loader/loader.conf diff --git a/files/UEFI/KDE4/EFI/boot/bootx64.efi b/files/UEFI/KDE4/EFI/boot/bootx64.efi Binary files differnew file mode 100644 index 0000000..c5e1458 --- /dev/null +++ b/files/UEFI/KDE4/EFI/boot/bootx64.efi diff --git a/files/UEFI/KDE4/loader/entries/01-mga-boot.conf b/files/UEFI/KDE4/loader/entries/01-mga-boot.conf new file mode 100644 index 0000000..8ad07cd --- /dev/null +++ b/files/UEFI/KDE4/loader/entries/01-mga-boot.conf @@ -0,0 +1,4 @@ +title Boot Mageia 4 Live +linux /boot/vmlinuz +initrd /boot/cdrom/initrd.gz +options root=mgalive:LABEL=Mageia-4-KDE4-LiveDVD splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 diff --git a/files/UEFI/KDE4/loader/entries/02-mga-install.conf b/files/UEFI/KDE4/loader/entries/02-mga-install.conf new file mode 100644 index 0000000..7b55197 --- /dev/null +++ b/files/UEFI/KDE4/loader/entries/02-mga-install.conf @@ -0,0 +1,4 @@ +title Install Mageia 4 Live +linux /boot/vmlinuz +initrd /boot/cdrom/initrd.gz +options root=mgalive:LABEL=Mageia-4-KDE4-LiveDVD splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 install diff --git a/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf b/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf new file mode 100644 index 0000000..7e0c9c5 --- /dev/null +++ b/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf @@ -0,0 +1,4 @@ +title Boot Mageia 4 Live (Safe mode) +linux /boot/vmlinuz +initrd /boot/cdrom/initrd.gz +options root=mgalive:LABEL=Mageia-4-KDE4-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=vesa diff --git a/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf b/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf new file mode 100644 index 0000000..f70c488 --- /dev/null +++ b/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf @@ -0,0 +1,4 @@ +title Boot Mageia 4 Live (USB FAT32) +linux /boot/vmlinuz +initrd /boot/cdrom/initrd.gz +options root=mgalive:LABEL=MGA4LIVE UEFI splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 diff --git a/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf b/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf new file mode 100644 index 0000000..afd6fce --- /dev/null +++ b/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf @@ -0,0 +1,4 @@ +title Install Mageia 4 Live (USB FAT32) +linux /boot/vmlinuz +initrd /boot/cdrom/initrd.gz +options root=mgalive:LABEL=MGA4LIVE UEFI splash quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 install diff --git a/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf b/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf new file mode 100644 index 0000000..fe45c18 --- /dev/null +++ b/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf @@ -0,0 +1,4 @@ +title Boot Mageia 4 Live (USB FAT32, Safe mode) +linux /boot/vmlinuz +initrd /boot/cdrom/initrd.gz +options root=mgalive:LABEL=MGA4LIVE UEFI rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=vesa diff --git a/files/UEFI/KDE4/loader/loader.conf b/files/UEFI/KDE4/loader/loader.conf new file mode 100644 index 0000000..da28360 --- /dev/null +++ b/files/UEFI/KDE4/loader/loader.conf @@ -0,0 +1,2 @@ +timeout 10 +default 01-mga-boot diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh index f200eab..ee55238 100755 --- a/files/mga_rpms/update_media.sh +++ b/files/mga_rpms/update_media.sh @@ -22,11 +22,13 @@ cp $bcdmedia/i586/media/core/release/grub2-2*.rpm i586/mga_rpms/core/ cp $bcdmedia/i586/media/core/release/grub2-efi-2*.rpm i586/mga_rpms/core/ cp $bcdmedia/i586/media/core/release/grub2-mageia-theme-*.rpm i586/mga_rpms/core/ cp $bcdmedia/i586/media/core/release/os-prober-*.rpm i586/mga_rpms/core/ +cp $bcdmedia/i586/media/core/release/efibootmgr-*.rpm i586/mga_rpms/core/ cp $bcdmedia/x86_64/media/core/release/grub2-2*.rpm x86_64/mga_rpms/core/ cp $bcdmedia/x86_64/media/core/release/grub2-efi-2*.rpm x86_64/mga_rpms/core/ cp $bcdmedia/x86_64/media/core/release/grub2-mageia-theme-*.rpm x86_64/mga_rpms/core/ cp $bcdmedia/x86_64/media/core/release/os-prober-*.rpm x86_64/mga_rpms/core/ +cp $bcdmedia/x86_64/media/core/release/efibootmgr-*.rpm x86_64/mga_rpms/core/ # add repo pubkeys cp $bcdmedia/i586/media/core/release/media_info/pubkey i586/mga_rpms/core/media_info/ diff --git a/files/pkgs.pm b/files/pkgs.pm index 5987da5..8a32a4d 100644 --- a/files/pkgs.pm +++ b/files/pkgs.pm @@ -259,7 +259,7 @@ sub remove_unused_packages { undef $wait; # Packages to not remove even if they seem unused - my @wanted_hardware_packages = qw(gnome-bluetooth gnome-phone-manager kbluetooth bluedevil kppp ppp wireless-tools wpa_supplicant radeon-firmware kernel-firmware-nonfree); + my @wanted_hardware_packages = qw(gnome-bluetooth pulseaudio-module-bluetooth gnome-phone-manager bluedevil kppp ppp wireless-tools wpa_supplicant kernel-firmware-nonfree radeon-firmware ralink-firmware rtlwifi-firmware ipw2100-firmware ipw2200-firmware iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-agn-ucode); @unused_hardware_packages = difference2(\@unused_hardware_packages, \@wanted_hardware_packages); @unused_hardware_packages || @unselected_locales or return; |