diff options
Diffstat (limited to 'config/auto_inst.cfg.pl')
| -rw-r--r-- | config/auto_inst.cfg.pl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 4ef23d4..450b9ef 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -9,7 +9,7 @@ my $distro_release = 'Default'; my $distro_config = lc($distro_release); my @desktops = split(/\|/, $ENV{DRAKLIVE_DESKTOP}); -my $has_plasma5 = member('PLASMA5', @desktops); +my $has_plasma = member('Plasma', @desktops); my $has_gnome = member('GNOME', @desktops); my $has_xfce = member('xfce4', @desktops); my $has_lxde = member('LXDE', @desktops); @@ -55,7 +55,7 @@ $o = { qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS), # system qw(SYSTEM MINIMAL_DOCS X ACCESSIBILITY THEMES), - if_($has_plasma5, qw(PLASMA5)), + if_($has_plasma, qw(PLASMA5)), if_($has_gnome, qw(GNOME)), if_($has_xfce, qw(XFCE)), if_($has_lxde, qw(LXDE)), @@ -125,12 +125,12 @@ $o = { ), # Plasma specific stuff - if_($has_plasma5, + if_($has_plasma, ), ], 'default_packages' => [ - if_($has_plasma5, "$distro_config-plasma5-config"), + if_($has_plasma, "$distro_config-plasma5-config"), if_($has_lxde, "mageia-lxde-config-$distro_release"), if_($has_xfce, "mageia-xfce-config-$distro_release"), @@ -169,13 +169,13 @@ $o = { ), # Plasma specific stuff - if_($has_plasma5, + if_($has_plasma, 'task-plasma5', 'sddm', # sometimes gets nuked during build 'manatools-qt' # take new tools for a spin ), ], - 'preferred_packages' => join(',', $has_plasma5 ? 'sddm' : 'gdm'), + 'preferred_packages' => join(',', $has_plasma ? 'sddm' : 'gdm'), 'meta_class' => 'desktop', 'desktop' => first(@desktops), if_($ENV{DRAKLIVE_DEFAULT_USER}, 'autologin' => $ENV{DRAKLIVE_DEFAULT_USER}), |