diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/auto_inst.cfg.pl | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 5cc935c..c2e36d1 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -138,11 +138,9 @@ $o = { 'qtradio', 'kradio', 'system-config-printer', 'poppler-data', 'tetex', - 'fglrx-control-center', '/^gimp-help/', '/^libreoffice-help/', 'libreoffice-base', - '/^nvidia.*-doc-html/', if_($has_plasma5, 'liblm_sensors3', 'xpdf-common', 'htdig', 'mirrordir', 'acr38u', 'ekiga', @@ -193,11 +191,10 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-4\.3\.0-desktop-/', '/^nvidia-current-kernel-4\.3\.0-desktop-/', '/^nvidia340-kernel-4\.3\.0-desktop-', '/^nvidia304-kernel-4\.3\.0-desktop-', '/^vboxadditions-kernel-4\.3\.0-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-4\.3\.0-server-/', '/^nvidia-current-kernel-4\.3\.0-server-/', '/^nvidia340-kernel-4\.3\.0-server-/', '/^nvidia304-kernel-4\.3\.0-server-/', '/^vboxadditions-kernel-4\.3\.0-server-/', - #if_($has_gnome, - '/^fglrx-kernel-4\.3\.0-desktop/', 'x11-driver-video-fglrx', - #), + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^vboxadditions-kernel-4\.3\.0-desktop-/'), + '/^kernel-server-/', '/^vboxadditions-kernel-4\.3\.0-server-/', + + # shipped in live nonfree '/^broadcom-wl-/', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core', '/^java-1.8.0-/'), @@ -231,16 +228,7 @@ $o = { if_($has_lxde, "mageia-lxde-config-$distro_release"), if_($has_xfce, "mageia-xfce-config-$distro_release"), - if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'vboxadditions-kernel-desktop586-latest', 'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest'), - if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'vboxadditions-kernel-desktop-latest', 'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'gummiboot'), - - #if_(!$has_gnome, - #if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'fglrx-kernel-desktop586-latest'), - #if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'fglrx-kernel-desktop-latest'), - #'x11-driver-video-fglrx', - #), - - 'x11-server-common', 'x11-driver-video-vboxvideo', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia340', 'x11-driver-video-nvidia304', + 'x11-server-common', 'x11-driver-video-vboxvideo', 'basesystem', 'x11-driver-video', 'x11-driver-input', 'bluez-firmware', 'mageiawelcome', 'usbutils', # we want lsusb |