summaryrefslogtreecommitdiffstats
path: root/config/auto_inst.cfg.pl
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-04-23 18:14:35 +0200
committerThomas Backlund <tmb@mageia.org>2015-04-23 18:14:35 +0200
commitf158b198d04d0aeac66aeaddae659316bdcdafae (patch)
tree95bb957593481b25ce0d8775b2b976a821a3f306 /config/auto_inst.cfg.pl
parent20d63cd59b4b5f25a26c8575fa72d1337df03e96 (diff)
downloaddraklive-config-f158b198d04d0aeac66aeaddae659316bdcdafae.tar
draklive-config-f158b198d04d0aeac66aeaddae659316bdcdafae.tar.gz
draklive-config-f158b198d04d0aeac66aeaddae659316bdcdafae.tar.bz2
draklive-config-f158b198d04d0aeac66aeaddae659316bdcdafae.tar.xz
draklive-config-f158b198d04d0aeac66aeaddae659316bdcdafae.zip
disable fglrx in live mode
Diffstat (limited to 'config/auto_inst.cfg.pl')
-rw-r--r--config/auto_inst.cfg.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index a647784..a1fea79 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -198,9 +198,9 @@ $o = {
'mono',
# block the kernels we dont want
- if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.19\.4-desktop-/', '/^nvidia-current-kernel-3\.10\.0-desktop-/', '/^nvidia340-kernel-3\.19\.4-desktop-', '/^nvidia304-kernel-3\.19\.4-desktop-', '/^vboxadditions-kernel-3\.19\.4-desktop-/'),
- '/^kernel-server-/', '/^fglrx-kernel-3\.19\.4-server-/', '/^nvidia-current-kernel-3\.19\.4-server-/', '/^nvidia340-kernel-3\.19\.4-server-/', '/^nvidia304-kernel-3\.19\.4-server-/', '/^vboxadditions-kernel-3\.19\.4-server-/',
- '/^broadcom-wl-/',
+ if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-/', '/^nvidia-current-kernel-3\.10\.0-desktop-/', '/^nvidia340-kernel-3\.19\.4-desktop-', '/^nvidia304-kernel-3\.19\.4-desktop-', '/^vboxadditions-kernel-3\.19\.4-desktop-/'),
+ '/^kernel-server-/', '/^fglrx-kernel-/', '/^nvidia-current-kernel-3\.19\.4-server-/', '/^nvidia340-kernel-3\.19\.4-server-/', '/^nvidia304-kernel-3\.19\.4-server-/', '/^vboxadditions-kernel-3\.19\.4-server-/',
+ '/^broadcom-wl-/', 'x11-driver-video-fglrx',
if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core', '/^java-1.8.0-/'),