summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-10 12:35:02 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-10 12:35:02 +0000
commitda94715e3d4e07486df853675958fd522016810c (patch)
tree8edacac989817a4567c5affc93694aeb7ff65d54 /perl-install/install_steps_interactive.pm
parente493243f413480eaab130284867a2fcb0f2b649d (diff)
downloaddrakx-backup-do-not-use-da94715e3d4e07486df853675958fd522016810c.tar
drakx-backup-do-not-use-da94715e3d4e07486df853675958fd522016810c.tar.gz
drakx-backup-do-not-use-da94715e3d4e07486df853675958fd522016810c.tar.bz2
drakx-backup-do-not-use-da94715e3d4e07486df853675958fd522016810c.tar.xz
drakx-backup-do-not-use-da94715e3d4e07486df853675958fd522016810c.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 81ba51710..5e8eb1c33 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -152,8 +152,8 @@ sub setupSCSI { setup_thiskind($_[0], 'scsi', $_[1], $_[2]) }
sub ask_mntpoint_s {
my ($o, $fstab) = @_;
my @fstab = grep { isExt2($_) } @$fstab;
- @fstab = grep { !isSwap($_) } @$fstab if @fstab == 0;
- @fstab = @$fstab if @fstab == 0;
+ @fstab = grep { isSwap($_) } @$fstab if @fstab == 0;
+# @fstab = @$fstab if @fstab == 0;
die _("no available partitions") if @fstab == 0;
my $msg = sub { "$_->{device} " . _("(%dMb)", $_->{size} / 1024 / 2) };
@@ -889,8 +889,6 @@ _("Some steps are not completed.
Do you really want to quit now?"), 0);
- $o->SUPER::exitInstall;
-
$o->ask_warn('',
_("Congratulations, installation is complete.
Remove the boot media and press return to reboot.
@@ -900,6 +898,8 @@ consult the Errata available from http://www.linux-mandrake.com/.
Information on configuring your system is available in the post
install chapter of the Official Linux-Mandrake User's Guide.")) if $alldone && !$::g_auto_install;
+
+ $o->SUPER::exitInstall;
}