From fca41a6e89e8c4df53ba49147e569441b753a34a Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 6 Sep 1999 23:13:20 +0000 Subject: no_comment --- perl-install/install2.pm | 2 +- perl-install/install_steps_interactive.pm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/perl-install/install2.pm b/perl-install/install2.pm index ab28caad7..4fccfd454 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -386,7 +386,7 @@ sub selectInstallClass { addToBeDone { install_any::setPackages($o); #update package list - } 'formatPartitions'; + } 'formatPartitions' unless $o->{steps}{doInstallStep}{done}; } #------------------------------------------------------------------------------ diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 1cef55e77..c23fb4ab6 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -485,7 +485,8 @@ failures. Would you like to create a bootdisk for your system?"), !$o->{mkbootdi $o->{mkbootdisk} = $o->ask_from_list('', _("Choose the floppy drive you want to use to make the bootdisk"), - \@l, $o->{mkbootdisk}); + [ @l, "Cancel" ], $o->{mkbootdisk}); + return if $o->{mkbootdisk} eq "Cancel"; } $o->ask_warn('', _("Insert a floppy in drive %s", $o->{mkbootdisk})); -- cgit v1.2.1