summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-02 05:21:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-02 05:21:21 +0000
commit6e9c6ce48159d3df1cb69788bebc503ff8697e26 (patch)
tree0c369d4eb7ee55bbb6872cb446f0d3946c62e52b /perl-install/install_steps_interactive.pm
parent8b52ae4b578e117a7135fe17f542af3714068851 (diff)
downloaddrakx-6e9c6ce48159d3df1cb69788bebc503ff8697e26.tar
drakx-6e9c6ce48159d3df1cb69788bebc503ff8697e26.tar.gz
drakx-6e9c6ce48159d3df1cb69788bebc503ff8697e26.tar.bz2
drakx-6e9c6ce48159d3df1cb69788bebc503ff8697e26.tar.xz
drakx-6e9c6ce48159d3df1cb69788bebc503ff8697e26.zip
allow upgrading a chroot (using drakx-in-chroot)
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index c44c60350..460e489f8 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -139,7 +139,7 @@ sub selectInstallClass {
my ($o) = @_;
if (my @l = install_any::find_root_parts($o->{fstab}, $o->{prefix})) {
- log::l("proposing to upgrade partitions " . join(" ", map { $_->{part}{device} } @l));
+ log::l("proposing to upgrade partitions " . join(" ", map { $_->{part} && $_->{part}{device} } @l));
my @releases = uniq(map { $_->{release} } @l);
if (@releases != @l) {
@@ -158,9 +158,10 @@ sub selectInstallClass {
format => sub { ref($_[0]) ? N("Upgrade %s", $_[0]{release}) : translate($_[0]) }
} ]);
if (ref $p) {
- my $part = $p->{part};
- log::l("choosing to upgrade partition $part->{device}");
- $o->{migrate_device_names} = install_any::use_root_part($o->{all_hds}, $part, $o);
+ if ($p->{part}) {
+ log::l("choosing to upgrade partition $p->{part}{device}");
+ $o->{migrate_device_names} = install_any::use_root_part($o->{all_hds}, $p->{part}, $o);
+ }
foreach (grep { $_->{mntpoint} } @{$o->{fstab}}) {
my ($options, $_unknown) = fs::mount_options::unpack($_);
$options->{encrypted} or next;