summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-10-08 16:09:39 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-10-08 16:09:39 +0000
commitda9ad08d97b011de0c34c46b1a2a1d2fdd7af5ba (patch)
treed561bddf121a505e1402afaeb5100d1dc7299f25 /perl-install
parentb90a7a1ade6c1b9fba1f45e5659e93ad7163f6a5 (diff)
downloaddrakx-backup-do-not-use-da9ad08d97b011de0c34c46b1a2a1d2fdd7af5ba.tar
drakx-backup-do-not-use-da9ad08d97b011de0c34c46b1a2a1d2fdd7af5ba.tar.gz
drakx-backup-do-not-use-da9ad08d97b011de0c34c46b1a2a1d2fdd7af5ba.tar.bz2
drakx-backup-do-not-use-da9ad08d97b011de0c34c46b1a2a1d2fdd7af5ba.tar.xz
drakx-backup-do-not-use-da9ad08d97b011de0c34c46b1a2a1d2fdd7af5ba.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index e0dd2478d..bfbf62651 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -208,7 +208,7 @@ sub searchAndMount4Upgrade {
#- get all ext2 partition that may be root partition.
my %Parts = my %parts = map { $_->{device} => $_ } grep { isExt2($_) } @{$o->{fstab}};
- while (%parts) {
+ while (keys(%parts) > 0) {
$root = $::beginner ? first(%parts) : $o->selectRootPartition(keys %parts);
$root = delete $parts{$root};
@@ -217,24 +217,24 @@ sub searchAndMount4Upgrade {
$root->{mntpoint} = "/";
log::l("trying to mount root partition $root->{device}");
eval { fs::mount_part($root, $o->{prefix}, 'readonly') };
+ $r = "/*ERROR*" if $@;
}
- my $found = -d "$r/etc/sysconfig" && [ fs::read_fstab("$r/etc/fstab") ];
+ $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, $o->{prefix}) };
}
- last unless is_empty_array_ref($found);
+ last if !is_empty_array_ref($found);
delete $root->{mntpoint};
$o->ask_warn(_("Information"),
_("%s: This is not a root partition, please select another one.", $root->{device})) unless $::beginner;
- undef $root;
}
- $root or die _("No root partition found");
+ is_empty_array_ref($found) and die _("No root partition found");
- $o->ask_warn(_("Information"), _("Found root partition : %s", $root->{device}));
+ log::l("Found root partition : $root->{device}");
$o->{prefix} = $root->{mntpoint};
#- test if the partition has to be fschecked and remounted rw.