diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-29 17:53:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-29 17:53:54 +0000 |
| commit | 38f7f8427f6300ccacb464a9d3b95e89d6f83ffc (patch) | |
| tree | 4bb5bf77bbe6128d4b458b30a277d655e6bf2e2b /perl-install/install_steps.pm | |
| parent | 42a8773fe0e728410692098f2a11652ef5752849 (diff) | |
| download | drakx-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar drakx-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar.gz drakx-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar.bz2 drakx-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.tar.xz drakx-38f7f8427f6300ccacb464a9d3b95e89d6f83ffc.zip | |
- drop oem & recovery code (which was broken)
- will be replaced with a root password + user accounts + network configuration a la drakfirsttime
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 716a5c66b..0752c50d5 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -211,7 +211,7 @@ sub doPartitionDisksAfter { die N("You must have a FAT partition mounted in /boot/efi"); } - if ($o->{partitioning}{use_existing_root} && !$::recovery) { + if ($o->{partitioning}{use_existing_root}) { #- ensure those partitions are mounted so that they are not proposed in choosePartitionsToFormat fs::mount_part($_, $o->{prefix}) foreach sort { $a->{mntpoint} cmp $b->{mntpoint} } grep { $_->{mntpoint} && maybeFormatted($_) } @{$o->{fstab}}; @@ -267,7 +267,7 @@ sub choosePartitionsToFormat($$) { $_->{mntpoint} or next; add2hash_($_, { toFormat => $_->{notFormatted} }) if $_->{fs_type}; #- eg: don't set toFormat for isRawRAID (0xfd) - $_->{$::recovery ? 'toFormat' : 'toFormatUnsure'} ||= member($_->{mntpoint}, '/', '/usr'); + $_->{toFormatUnsure} ||= member($_->{mntpoint}, '/', '/usr'); if (!$_->{toFormat}) { my $fs_type = fs::type::fs_type_from_magic($_); |