From 1a7671a56936fb15a8c71750a85fdd62216c5bc5 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sun, 31 Aug 2014 14:28:16 +0200 Subject: Mga 4.1 configs --- config/auto_inst.cfg.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'config/auto_inst.cfg.pl') diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 4f48f8c..e3b0da1 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -196,8 +196,8 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.12\.8-desktop-/', '/^nvidia-current-kernel-3\.12\.8-desktop-/', '/^nvidia304-kernel-3\.12\.8-desktop-', '/^nvidia173-kernel-3\.12\.8-desktop-/', '/^vboxadditions-kernel-3\.12\.8-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-3\.12\.8-server-/', '/^nvidia-current-kernel-3\.12\.8-server-/', '/^nvidia304-kernel-3\.12\.8-server-/', '/^nvidia173-kernel-3\.12\.8-server-/', '/^vboxadditions-kernel-3\.12\.8-server-/', + 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_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'), @@ -210,7 +210,7 @@ $o = { 'flash-player-plugin', # xguest sucks - 'xguest', + 'xguest', 'apper', # not wanted (mga #9752) 'al-anvar', @@ -261,6 +261,8 @@ $o = { if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session',), + if_($has_kde4, 'kcm_touchpad',), + if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i, 'samba-client', 'RealPlayer', 'RealPlayer-rpnp', -- cgit v1.2.1