diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-04-13 23:27:43 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-04-13 23:27:43 +0000 |
| commit | 3f3ced984833bf1084447c1afd3cfc7d17d0838b (patch) | |
| tree | d1c9b1884efe353b3fa5a165ca7f601dfa8c6ff5 /perl-install/install2.pm | |
| parent | 21afb921cd71327cae09ec568f11e6f020a93229 (diff) | |
| download | drakx-3f3ced984833bf1084447c1afd3cfc7d17d0838b.tar drakx-3f3ced984833bf1084447c1afd3cfc7d17d0838b.tar.gz drakx-3f3ced984833bf1084447c1afd3cfc7d17d0838b.tar.bz2 drakx-3f3ced984833bf1084447c1afd3cfc7d17d0838b.tar.xz drakx-3f3ced984833bf1084447c1afd3cfc7d17d0838b.zip | |
no_comment
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 87b4a3a01..5de9f6cc6 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -128,6 +128,7 @@ arch() =~ /^sparc/ ? ( ], ), ); +$suggestedPartitions{corporate} = $suggestedPartitions{server}; #-####################################################################################### #-$O @@ -271,7 +272,7 @@ sub selectInstallClass { @{$o->{orderedSteps}} = map { /setupSCSI/ ? ($_, "partitionDisks") : $_ } grep { !/partitionDisks/ } @{$o->{orderedSteps}}; my $s; foreach (@{$o->{orderedSteps}}) { - $s->{next} = $_; + $s->{next} = $_ if $s; $s = $o->{steps}{$_}; } } @@ -337,7 +338,7 @@ sub formatPartitions { #- Do not update inode access times on this #- file system (e.g, for faster access on the #- news spool to speed up news servers). - $o->{pcmcia} and $_->{options} = "noatime" foreach grep { isExt2($_) } @{$o->{fstab}}; + $o->{pcmcia} and $_->{options} = "noatime" foreach grep { isTrueFS($_) } @{$o->{fstab}}; } #------------------------------------------------------------------------------ @@ -513,6 +514,8 @@ sub main { } } $cmdline{$opt} = 1 if $opt; + $::beginner = 1; + map_each { my ($n, $v) = @_; my $f = ${{ @@ -520,8 +523,8 @@ sub main { pcmcia => sub { $o->{pcmcia} = $v }, vga => sub { $o->{vga16} = $v }, step => sub { $o->{steps}{first} = $v }, - expert => sub { $::expert = 1 }, - beginner => sub { $::beginner = 1 }, + expert => sub { $::expert = 1; $::beginner = 0 }, + beginner => sub { $::beginner = $v }, class => sub { $o->{installClass} = $v }, lnx4win => sub { $o->{lnx4win} = 1 }, readonly => sub { $o->{partitioning}{readonly} = $v ne "0" }, |