diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-11-22 19:28:37 +0200 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-11-22 19:28:37 +0200 |
| commit | 5723f6a80d2a01582d497152a7f973fcd3bb43b5 (patch) | |
| tree | 03424f4b7f9ec6c86b791804250da8800665966b /config | |
| parent | acceddc94eaf26ebe61e10a993ee0f5820216aa4 (diff) | |
| download | draklive-config-5723f6a80d2a01582d497152a7f973fcd3bb43b5.tar draklive-config-5723f6a80d2a01582d497152a7f973fcd3bb43b5.tar.gz draklive-config-5723f6a80d2a01582d497152a7f973fcd3bb43b5.tar.bz2 draklive-config-5723f6a80d2a01582d497152a7f973fcd3bb43b5.tar.xz draklive-config-5723f6a80d2a01582d497152a7f973fcd3bb43b5.zip | |
fglrx is currently broken (no x11-server 1.18 and kernel-4.3 support)
Diffstat (limited to 'config')
| -rw-r--r-- | config/auto_inst.cfg.pl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 42af535..5665f75 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -199,7 +199,9 @@ $o = { # 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_($has_gnome, + '/^fglrx-kernel-4\.3\.0-desktop/', 'x11-driver-video-fglrx', + #), '/^broadcom-wl-/', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core', '/^java-1.8.0-/'), @@ -238,11 +240,11 @@ $o = { 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', - ), + #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', 'basesystem', 'x11-driver-video', 'x11-driver-input', |