rendered paste bodyIndex: config/auto_inst.cfg.pl===================================================================--- config/auto_inst.cfg.pl (révision 976)+++ config/auto_inst.cfg.pl (copie de travail)@@ -21,6 +21,7 @@ my $has_xfce = member('xfce4', @desktops); my $has_lxde = member('LXDE', @desktops); my $has_moblin = member('Moblin', @desktops);+my $all_desktops = any {'all', @desktops); $o = { 'media' => [@@ -32,6 +33,7 @@ 'Contrib', 'Contrib Updates', 'Non-free', 'Non-free Updates', 'Restricted', 'Restricted Updates',+# 'Main', 'Contrib', 'Non-free', ), }, if_($ENV{DRAKLIVE_ADDITIONAL_REPOSITORY}, @@ -62,6 +64,12 @@ if_($has_xfce, qw(XFCE)), if_($has_lxde, qw(LXDE)), if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, qw(GAMES)),+ if_($all_desktops, + qw(KDE), + qw(GNOME), + qw(XFCE), + qw(LXDE)+ ), )), }, # so that rpmsrate flags are really used@@ -97,8 +105,7 @@ if_($ENV{DRAKLIVE_PRODUCT} !~ /flash/i, 'task-printing-scanning'), 'qtradio', 'kradio', if_(!$has_gnome, 'gnome-media'),- 'system-config-printer',- #if_(!$has_gnome, 'system-config-printer'),+ if_($has_kde, 'system-config-printer'),'qalculate', 'poppler-data', 'tetex', 'fglrx-control-center', '/^gimp-help/',@@ -156,7 +163,7 @@ 'default_packages' => [ if_($has_kde4, "$mandriva_config-kde4-config"), if_($has_lxde, "mandriva-lxde-config-$mandriva_release"),- if_($has_xfce, "mandriva-xfce-config-$mandriva_release"),+ if_($has_xfce, "mandriva-xfce-config-$mandriva_release", 'task-xfce-plugins'), if_($has_moblin, 'task-moblin'),