From 3d1403b296827ff2a90a500c8e3eb9ecadcfe233 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sun, 31 Aug 2014 14:39:26 +0200 Subject: Mga 5 Alpha1 configs --- config/auto_inst.cfg.pl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'config/auto_inst.cfg.pl') diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index e3b0da1..511fa3c 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -196,9 +196,9 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.12\.21-desktop-/', '/^nvidia-current-kernel-3\.12\.21-desktop-/', '/^nvidia304-kernel-3\.12\.21-desktop-', '/^nvidia173-kernel-3\.12\.21-desktop-/', '/^vboxadditions-kernel-3\.12\.21-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-3\.12\.21-server-/', '/^nvidia-current-kernel-3\.12\.21-server-/', '/^nvidia304-kernel-3\.12\.21-server-/', '/^nvidia173-kernel-3\.12\.21-server-/', '/^vboxadditions-kernel-3\.12\.21-server-/', - '/^broadcom-wl-/', + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.15\.2-desktop-/', '/^nvidia-current-kernel-3\.15\.2-desktop-/', '/^nvidia304-kernel-3\.15\.2-desktop-', '/^nvidia173-kernel-3\.15\.2-desktop-/', '/^vboxadditions-kernel-3\.15\.2-desktop-/'), + '/^kernel-server-/', '/^fglrx-kernel-3\.15\.2-server-/', '/^nvidia-current-kernel-3\.15\.2-server-/', '/^nvidia304-kernel-3\.15\.2-server-/', '/^nvidia173-kernel-3\.15\.2-server-/', '/^vboxadditions-kernel-3\.15\.2-server-/', + '/^broadcom-wl-/', '/^nvidia-current-/', '/^nvidia304-/', '/^nvidia173-/', '/^fglrx-/', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'), @@ -241,11 +241,11 @@ $o = { if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0'), if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0'), - if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'fglrx-kernel-desktop586-latest', 'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest', 'nvidia173-kernel-desktop586-latest', 'vboxadditions-kernel-desktop586-latest'), - if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'fglrx-kernel-desktop-latest', 'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'nvidia173-kernel-desktop-latest', 'vboxadditions-kernel-desktop-latest', 'gummiboot'), + if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'vboxadditions-kernel-desktop586-latest'), + if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'vboxadditions-kernel-desktop-latest', 'gummiboot'), - 'x11-server-common', 'x11-driver-video-fglrx', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia304', 'x11-driver-video-nvidia173', 'x11-driver-video-vboxvideo', - 'basesystem', + 'x11-server-common', 'x11-driver-video-vboxvideo', + 'basesystem', 'x11-driver-video', 'x11-driver-input', 'bluez-firmware', 'mageiawelcome', 'usbutils', # we want lsusb 'shared-mime-info', # needed for .desktop files to work atleast in gnome -- cgit v1.2.1