summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-12-21 14:06:23 +0000
committerFrancois Pons <fpons@mandriva.com>1999-12-21 14:06:23 +0000
commit7ba603b13fe12d4f0ca63281bbb844da54981717 (patch)
treed01f1dd170d195544049115063936b98a3219431
parentf56350762a1516bad6d7d8fa74e9395d50c81ea3 (diff)
downloaddrakx-7ba603b13fe12d4f0ca63281bbb844da54981717.tar
drakx-7ba603b13fe12d4f0ca63281bbb844da54981717.tar.gz
drakx-7ba603b13fe12d4f0ca63281bbb844da54981717.tar.bz2
drakx-7ba603b13fe12d4f0ca63281bbb844da54981717.tar.xz
drakx-7ba603b13fe12d4f0ca63281bbb844da54981717.zip
*** empty log message ***
-rw-r--r--perl-install/install_any.pm1
-rw-r--r--perl-install/install_steps_interactive.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 2479686fd..f72733d60 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -252,6 +252,7 @@ sub searchAndMount4Upgrade {
} else {
delete $root->{mntpoint};
($Parts{$_->{device}} || {})->{mntpoint} = $_->{mntpoint} foreach @$found;
+ map { $_->{mntpoint} = 'swap_upgrade' } grep { isSwap($_) } @{$o->{fstab}}; #- use all available swap.
#- TODO fsck, create check_mount_all ?
fs::mount_all([ grep { isExt2($_) || isSwap($_) } @{$o->{fstab}} ], $o->{prefix});
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a428682a3..b00ca1204 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -58,7 +58,7 @@ sub selectLanguage($) {
#- $o->{useless_thing_accepted} = $o->ask_from_list_('',
#-"Warning no warranty",
-#- [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or exit(1) unless $o->{useless_thing_accepted};
+#- [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or _exit(1) unless $o->{useless_thing_accepted};
}
#------------------------------------------------------------------------------
sub selectKeyboard($) {