From 8fbe674ed37d05169dde3e8f1c170758d0f66c4a Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sun, 31 Aug 2014 14:13:15 +0200 Subject: Mga 4 final configs --- config/auto_inst.cfg.pl | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'config/auto_inst.cfg.pl') diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 9ff289b..4f48f8c 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\.6-desktop-/', '/^nvidia-current-kernel-3\.12\.6-desktop-/', '/^nvidia304-kernel-3\.12\.6-desktop-', '/^nvidia173-kernel-3\.12\.6-desktop-/', '/^vboxadditions-kernel-3\.12\.6-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-3\.12\.6-server-/', '/^nvidia-current-kernel-3\.12\.6-server-/', '/^nvidia304-kernel-3\.12\.6-server-/', '/^nvidia173-kernel-3\.12\.6-server-/', '/^vboxadditions-kernel-3\.12\.6-server-/', + 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-/', '/^broadcom-wl-/', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'), @@ -218,6 +218,9 @@ $o = { # broken 'audacity', + # not wanted + 'mate-polkit', + # theese are in live media 'broadcom-bcma-config', 'broadcom-ssb-config', @@ -247,7 +250,7 @@ $o = { 'usbutils', # we want lsusb 'shared-mime-info', # needed for .desktop files to work atleast in gnome 'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch', - 'mageia-doc-mcc-en', + 'mageia-doc-mcc-en', 'bind-utils', if_($ENV{DRAKLIVE_REGION} eq 'all', 'vim-enhanced', ), @@ -256,7 +259,7 @@ $o = { if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'), - if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted', 'gnome-classic-session',), + if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session',), if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i, 'samba-client', @@ -337,8 +340,8 @@ $o = { if_($has_xfce || $has_lxde, "rm -f /etc/sysconfig/autologin"), if_($distro_theme eq 'Liveusb-Rw', #- set blue gtk theme for Liveusb-Rw in Gnome - "/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /apps/metacity/general/theme 'Ia Ora Blue'", - "/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /desktop/gnome/interface/gtk_theme 'Ia Ora Blue'", + #/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /apps/metacity/general/theme 'Ia Ora Blue'", + #/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /desktop/gnome/interface/gtk_theme 'Ia Ora Blue'", #- set blue gtk theme for Liveusb-Rw in GTK "perl -pi -e 's/META_CLASS=.*/META_CLASS=powerpack/' /etc/sysconfig/system", "echo MDV_MENU_STYLE=discovery > /etc/sysconfig/menustyle", -- cgit v1.2.1