summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/auto_inst.cfg.pl20
-rw-r--r--config/live.cfg30
-rw-r--r--config/settings-livecd.cfg5
-rw-r--r--files/UEFI/EFI/boot/bootx64.efibin84120 -> 0 bytes
-rw-r--r--files/UEFI/GNOME/EFI/boot/bootx64.efibin0 -> 81530 bytes
-rw-r--r--files/UEFI/GNOME/loader/entries/01-mga-boot.conf4
-rw-r--r--files/UEFI/GNOME/loader/entries/02-mga-install.conf4
-rw-r--r--files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf4
-rw-r--r--files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf (renamed from files/UEFI/loader/entries/01-mga-boot.conf)2
-rw-r--r--files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf (renamed from files/UEFI/loader/entries/02-mga-install.conf)2
-rw-r--r--files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf (renamed from files/UEFI/loader/entries/03-mga-boot-safe.conf)2
-rw-r--r--files/UEFI/GNOME/loader/loader.conf (renamed from files/UEFI/loader/loader.conf)0
-rw-r--r--files/UEFI/KDE4/EFI/boot/bootx64.efibin0 -> 81530 bytes
-rw-r--r--files/UEFI/KDE4/loader/entries/01-mga-boot.conf4
-rw-r--r--files/UEFI/KDE4/loader/entries/02-mga-install.conf4
-rw-r--r--files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf4
-rw-r--r--files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf4
-rw-r--r--files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf4
-rw-r--r--files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf4
-rw-r--r--files/UEFI/KDE4/loader/loader.conf2
-rwxr-xr-xfiles/mga_rpms/update_media.sh2
-rw-r--r--files/pkgs.pm2
22 files changed, 79 insertions, 24 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 9a1f6cd..350e8c1 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -199,8 +199,8 @@ $o = {
'mono',
# block the kernels we dont want
- if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-*-desktop-/', '/^nvidia-current-kernel-*-desktop-/', '/^nvidia304-kernel-*-desktop-', '/^nvidia173-kernel-*-desktop-/', '/^vboxadditions-kernel-*-desktop-/'),
- '/^kernel-server-/', '/^fglrx-kernel-*-server-/', '/^nvidia-current-kernel-*-server-/', '/^nvidia304-kernel-*-server-/', '/^nvidia173-kernel-*-server-/', '/^vboxadditions-kernel-*-server-/',
+ if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3.12.3-desktop-/', '/^nvidia-current-kernel-3.12.3-desktop-/', '/^nvidia304-kernel-3.12.3-desktop-', '/^nvidia173-kernel-3.12.3-desktop-/', '/^vboxadditions-kernel-3.12.3-desktop-/'),
+ '/^kernel-server-/', '/^fglrx-kernel-3.12.3-server-/', '/^nvidia-current-kernel-3.12.3-server-/', '/^nvidia304-kernel-3.12.3-server-/', '/^nvidia173-kernel-3.12.3-server-/', '/^vboxadditions-kernel-3.12.3-server-/',
'/^broadcom-wl-/',
if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'),
@@ -222,6 +222,10 @@ $o = {
'audacity',
'broadcom-bcma-config', 'broadcom-ssb-config',
+
+
+ # uClibc & co
+# 'uClibc', 'libuClibc0.9.30.3', 'libuClibc-zlib1', 'lib64uClibc0.9.30.3', 'lib64uClibc-zlib1',
if_($ENV{DRAKLIVE_REGION} eq 'int', 'ardour', 'ardour3', 'lftp', 'lm_sensors', 'kscd', 'tvtime', 'kamera', '/^plasma-applet-system-monitor-/', 'dragon', 'k3b', ),
],
@@ -233,15 +237,15 @@ $o = {
if_($has_moblin, 'task-moblin'),
# do we still need ?
- #if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0'),
- #if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0'),
+ if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0'),
+ if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0'),
if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'fglrx-kernel-desktop586-latest', 'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest', 'nvidia173-kernel-desktop586-latest', 'vboxadditions-kernel-desktop586-latest'),
if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'fglrx-kernel-desktop-latest', 'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'nvidia173-kernel-desktop-latest', 'vboxadditions-kernel-desktop-latest', 'gummiboot'),
- 'x11-server-common', 'x11-driver-video-fglrx', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia173', 'x11-driver-video-nvidia304', 'x11-driver-video-vboxvideo',
-
- 'basesystem', 'bluez-firmware', 'mageiawelcome',
+ 'x11-server-common', 'x11-driver-video-fglrx', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia304', 'x11-driver-video-nvidia173', 'x11-driver-video-vboxvideo',
+ 'basesystem',
+ 'bluez-firmware', 'mageiawelcome',
'usbutils', # we want lsusb
'shared-mime-info', # needed for .desktop files to work atleast in gnome
'dmraid', 'mdadm', 'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch',
@@ -254,7 +258,7 @@ $o = {
if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'),
- if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted', ),#, 'ibus-ui-gtk3'),
+ if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted', 'gnome-classic-session',),#, 'ibus-ui-gtk3'),
if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i,
'samba-client',
diff --git a/config/live.cfg b/config/live.cfg
index d1f9a2a..b25c26f 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -41,7 +41,7 @@ my $_l = {
),
# fix gnome-shell not showing draklive-install and register icons on desktop in live mode
if_($live->{settings}{desktop} eq 'GNOME',
- #[ 'files/draklive-install.desktop', '/home/live/Desktop/draklive-install.desktop', { mode => 0755, no_install => 1 } ],
+ #[ 'files/draklive-install.desktop', '/usr/share/applications/mageia-draklive-install.desktop', { mode => 0755, no_install => 1 } ],
[ 'files/register.desktop', '/usr/share/applications/register.desktop', { mode => 0644 } ],
[ 'files/01_gsettings-desktop-schemas.gschema.override', '/usr/share/glib-2.0/schemas/01_gsettings-desktop-schemas.gschema.override', { mode => 0644, no_install => 1 } ],
),
@@ -49,7 +49,7 @@ my $_l = {
[ 'files/blacklist_ide.conf', '/etc/modprobe.d/blacklist_ide.conf', { mode => 0644 } ],
# lock bluedevil, radeon-firmware, kernel-firnware-nonfree
- #[ 'files/pkgs.pm', '/usr/lib/libDrakX/pkgs.pm', { mode => 0644 } ],
+ [ 'files/pkgs.pm', '/usr/lib/libDrakX/pkgs.pm', { mode => 0644 } ],
# shorewall fixes
#[ 'files/shorewall-interfaces', '/etc/shorewall/interfaces', { mode => 0644 } ],
@@ -63,7 +63,7 @@ my $_l = {
[ 'files/mga_rpms/x86_64/mga_rpms', '/var/local/mga_rpms' ],
),
# default to grub legacy
- #[ 'files/bootloader.pm', '/usr/lib/libDrakX/bootloader.pm', { mode => 0644 } ],
+ [ 'files/bootloader.pm', '/usr/lib/libDrakX/bootloader.pm', { mode => 0644 } ],
# disable suspend and hibernate in live mode
[ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ],
#- make cups the default spooler
@@ -85,14 +85,14 @@ my $_l = {
[ 'files/draklive-install.d/remove.d/disable-speedboot', '/etc/draklive-install.d/remove.d/disable-speedboot', { mode => 0644 } ],
# copy mgalive fix for installer progress bar
- [ 'files/90mgalive/mgalive-root.sh', '/usr/lib/dracut/modules.d/90mgalive/mgalive-root.sh', { mode => 0755 } ],
- [ 'files/90mgalive/module-setup.sh', '/usr/lib/dracut/modules.d/90mgalive/module-setup.sh', { mode => 0755 } ],
- [ 'files/draklive-install', '/usr/sbin/draklive-install', { mode => 0755 } ],
+ #[ 'files/90mgalive/mgalive-root.sh', '/usr/lib/dracut/modules.d/90mgalive/mgalive-root.sh', { mode => 0755 } ],
+ #[ 'files/90mgalive/module-setup.sh', '/usr/lib/dracut/modules.d/90mgalive/module-setup.sh', { mode => 0755 } ],
+ #[ 'files/draklive-install', '/usr/sbin/draklive-install', { mode => 0755 } ],
if_($live->{settings}{desktop} eq 'KDE4',
[ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ]),
#if_($live->{settings}{desktop} eq 'GNOME',
- # [ 'files/draklive-install.d/run.d/gsettings.sh', '/etc/draklive-install.d/run.d/gsettings.sh', { mode => 755 } ]),
+ #[ 'files/draklive-install.d/run.d/gsettings.sh', '/etc/draklive-install.d/run.d/gsettings.sh', { mode => 755 } ]),
#- sysconfig files for first boot
[ $live->{settings}{media} eq 'usb' ?
"files/finish-install.$live->{settings}{media}" :
@@ -275,14 +275,19 @@ my $_l = {
media => {
storage => 'cdrom',
bootloader_timeout => 10,
- boot_entries => [ "" => "", "linux" => " install", "harddisk" => "" ],
+ boot_entries => [ "" => "", "linux" => " install", "safe" => "", "harddisk" => "" ],
if_($live->{settings}{product} =~ /LiveCD/i,
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 uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ],
files => [
if_($live->{settings}{arch} eq 'x86_64',
- [ 'files/UEFI/*', '' ],
+ if_($live->{settings}{desktop} eq 'KDE4',
+ [ 'files/UEFI/KDE4/*', '' ],
+ ),
+ if_($live->{settings}{desktop} eq 'GNOME',
+ [ 'files/UEFI/GNOME/*', '' ],
+ ),
),
# FIXME: add doc and autorun
#[ 'extra/livecd/autorun/*', ''],
@@ -295,7 +300,12 @@ my $_l = {
extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ],
files => [
if_($live->{settings}{arch} eq 'x86_64',
- [ 'files/UEFI/*', '' ],
+ if_($live->{settings}{desktop} eq 'KDE4',
+ [ 'files/UEFI/KDE4/*', '' ],
+ ),
+ if_($live->{settings}{desktop} eq 'GNOME',
+ [ 'files/UEFI/GNOME/*', '' ],
+ ),
),
# FIXME: add doc and autorun
#[ 'extra/livecd/autorun/*', ''],
diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg
index fb004bc..2deff2f 100644
--- a/config/settings-livecd.cfg
+++ b/config/settings-livecd.cfg
@@ -1,16 +1,17 @@
#repository=/distrib/mageia/distrib/cauldron
repository=/home/bcd/build_bcd/pieces/cauldron
+#repository=/home/draklive/distrib/cauldron
# updates_repository=/distrib/mageia/distrib/cauldron
# updates_repository=/home/bcd/build_bcd/pieces/cauldron
additional_repository=
arch=i586
desktop=KDE4
media=DVD
-region=all
+region=int
pack=
name=Mageia
product=LiveDVD
-version=4-beta1
+version=4-beta2
commercial=0
default_user=live
builddir=/home/draklive/var-data/build
diff --git a/files/UEFI/EFI/boot/bootx64.efi b/files/UEFI/EFI/boot/bootx64.efi
deleted file mode 100644
index ccedcab..0000000
--- a/files/UEFI/EFI/boot/bootx64.efi
+++ /dev/null
Binary files differ
diff --git a/files/UEFI/GNOME/EFI/boot/bootx64.efi b/files/UEFI/GNOME/EFI/boot/bootx64.efi
new file mode 100644
index 0000000..c5e1458
--- /dev/null
+++ b/files/UEFI/GNOME/EFI/boot/bootx64.efi
Binary files differ
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
new file mode 100644
index 0000000..c5e1458
--- /dev/null
+++ b/files/UEFI/KDE4/EFI/boot/bootx64.efi
Binary files differ
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;