summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2014-10-03 20:48:59 +0300
committerThomas Backlund <tmb@mageia.org>2014-10-03 20:48:59 +0300
commitc663a0605fb9ae8094f0bd683c070f87650d11a2 (patch)
tree4574991781cdb4616caf4e8c162014f6dc626804
parent176cb8e00270fe05bd3e654e273143e2fec9a7f6 (diff)
downloaddraklive-config-c663a0605fb9ae8094f0bd683c070f87650d11a2.tar
draklive-config-c663a0605fb9ae8094f0bd683c070f87650d11a2.tar.gz
draklive-config-c663a0605fb9ae8094f0bd683c070f87650d11a2.tar.bz2
draklive-config-c663a0605fb9ae8094f0bd683c070f87650d11a2.tar.xz
draklive-config-c663a0605fb9ae8094f0bd683c070f87650d11a2.zip
fglrx now supports x11-server 1.16
-rw-r--r--config/auto_inst.cfg.pl8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 870c291..399b5df 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -198,7 +198,7 @@ $o = {
# block the kernels we dont want
if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.17\.0-desktop-/', '/^nvidia-current-kernel-3\.17\.0-desktop-/', '/^nvidia304-kernel-3\.17\.0-desktop-', '/^vboxadditions-kernel-3\.17\.0-desktop-/'),
'/^kernel-server-/', '/^fglrx-kernel-3\.17\.0-server-/', '/^nvidia-current-kernel-3\.17\.0-server-/', '/^nvidia304-kernel-3\.17\.0-server-/', '/^vboxadditions-kernel-3\.17\.0-server-/',
- '/^broadcom-wl-/', '/^fglrx-/',
+ '/^broadcom-wl-/',
if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'),
@@ -241,10 +241,10 @@ $o = {
if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0'),
if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0'),
- 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_($ENV{DRAKLIVE_ARCH} eq 'i586', 'vboxadditions-kernel-desktop586-latest', 'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest', 'fglrx-kernel-desktop586-latest'),
+ if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'vboxadditions-kernel-desktop-latest', 'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'fglrx-kernel-desktop-latest', 'gummiboot'),
- 'x11-server-common', 'x11-driver-video-vboxvideo', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia304',
+ 'x11-server-common', 'x11-driver-video-vboxvideo', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia304', 'x11-driver-video-fglrx',
'basesystem', 'x11-driver-video', 'x11-driver-input',
'bluez-firmware', 'mageiawelcome',
'usbutils', # we want lsusb