diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-10-08 15:12:08 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-10-08 15:12:08 +0000 |
| commit | 2c23b224f71e7b9f634555029e038e39861559f7 (patch) | |
| tree | 8939092f1b2ea7f62b598bdbb2d37b38ee2de9bd | |
| parent | caacc56bdbc6908731eae8f90cf8c4c484a88d7a (diff) | |
| download | drakx-backup-do-not-use-2c23b224f71e7b9f634555029e038e39861559f7.tar drakx-backup-do-not-use-2c23b224f71e7b9f634555029e038e39861559f7.tar.gz drakx-backup-do-not-use-2c23b224f71e7b9f634555029e038e39861559f7.tar.bz2 drakx-backup-do-not-use-2c23b224f71e7b9f634555029e038e39861559f7.tar.xz drakx-backup-do-not-use-2c23b224f71e7b9f634555029e038e39861559f7.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install_any.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 4ee222fe3..181a616cf 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -205,9 +205,9 @@ sub searchAndMount4Upgrade { getHds($o); #- get all ext2 partition that may be root partition. - my %Parts = my %parts = map { $_->{device} => $_ } grep { isExt2($_->{type}) } @{$o->{fstab}}; + my %Parts = my %parts = map { $_->{device} => $_ } grep { isExt2($_) } @{$o->{fstab}}; while (%parts) { - my $root = $::beginner ? first(%parts) : $o->selectRootPartition(keys %parts); + $root = $::beginner ? first(%parts) : $o->selectRootPartition(keys %parts); $root = delete $parts{$root}; my $r; unless ($r = $root->{realMntpoint}) { @@ -216,14 +216,14 @@ sub searchAndMount4Upgrade { log::l("trying to mount root partition $root->{device}"); eval { fs::mount_part($root, $o->{prefix}, 'readonly') }; } - my $found = -d "$r/etc/sysconfig" && [ fs::read_fstab("$root/etc/fstab") ]; + my $found = -d "$r/etc/sysconfig" && [ fs::read_fstab("$r/etc/fstab") ]; unless ($root->{realMntpoint}) { log::l("umounting non root partition $root->{device}"); - eval { fs::umount_part($root) }; + eval { fs::umount_part($root, $o->{prefix}) }; } - last if $found; + last if is_empty_array_ref($found); delete $root->{mntpoint}; $o->ask_warn(_("Information"), |