diff options
Diffstat (limited to 'config/auto_inst.cfg.pl')
-rw-r--r-- | config/auto_inst.cfg.pl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 854f4ae..5b19745 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -198,9 +198,10 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-/', '/^nvidia-current-kernel-3\.19\.8-desktop-/', '/^nvidia340-kernel-3\.19\.8-desktop-', '/^nvidia304-kernel-3\.19\.8-desktop-', '/^vboxadditions-kernel-3\.19\.8-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-/', '/^nvidia-current-kernel-3\.19\.8-server-/', '/^nvidia340-kernel-3\.19\.8-server-/', '/^nvidia304-kernel-3\.19\.8-server-/', '/^vboxadditions-kernel-3\.19\.8-server-/', - '/^broadcom-wl-/', 'x11-driver-video-fglrx', + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.19\.8-desktop-/', '/^nvidia-current-kernel-3\.19\.8-desktop-/', '/^nvidia340-kernel-3\.19\.8-desktop-', '/^nvidia304-kernel-3\.19\.8-desktop-', '/^vboxadditions-kernel-3\.19\.8-desktop-/'), + '/^kernel-server-/', '/^fglrx-kernel-3\.19\.8-server-/', '/^nvidia-current-kernel-3\.19\.8-server-/', '/^nvidia340-kernel-3\.19\.8-server-/', '/^nvidia304-kernel-3\.19\.8-server-/', '/^vboxadditions-kernel-3\.19\.8-server-/', + if_($has_gnome, '/^fglrx-kernel-3\.19\.8-desktop/', 'x11-driver-video-fglrx'), + '/^broadcom-wl-/', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core', '/^java-1.8.0-/'), @@ -241,6 +242,12 @@ $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', + ), + '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', 'bluez-firmware', 'mageiawelcome', |