diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-09-15 20:42:47 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-09-15 20:42:47 +0000 |
| commit | 851338fe8bf4c8d057984431b542b333cbad4b8e (patch) | |
| tree | 7029da4dde591025d410100a9b1b126967ba2f76 /perl-install/install2.pm | |
| parent | 91608779ad460d1481bec34e39db4661b4950441 (diff) | |
| download | drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.gz drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.bz2 drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.xz drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.zip | |
no_comment
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 76a7c52c3..9d9e30dfa 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -501,7 +501,8 @@ sub main { expert => sub { $::expert = 1; $::beginner = 0 }, beginner => sub { $::beginner = $v }, class => sub { $o->{installClass} = $v }, - fclass => sub { $o->{installClass} = $v; push @auto, "selectInstallClass" }, + fclass => sub { $o->{installClass} = $v; push @auto, 'selectInstallClass' }, + desktop => sub { $o->{meta_class} = 'desktop' }, lnx4win => sub { $o->{lnx4win} = 1 }, readonly => sub { $o->{partitioning}{readonly} = $v ne "0" }, display => sub { $o->{display} = $v }, @@ -632,6 +633,11 @@ sub main { $o->{interactive} = "newt"; require install_steps_newt; } + $o->{meta_class} = 'desktop' if cat__(install_any::getFile("VERSION")) =~ /desktop/i; + if ($o->{meta_class} eq 'desktop') { + $o->{installClass} = 'normal'; + push @auto, 'selectInstallClass'; + } if ($oem) { push @auto, 'selectInstallClass', 'selectMouse', 'configureTimezone', 'exitInstall'; } |