summaryrefslogtreecommitdiffstats
path: root/move
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-06-22 11:01:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-06-22 11:01:52 +0000
commit92db4f7f8a0133d4878633796638180e25f94bd0 (patch)
treed6852e5671f6e4a3ba6bf481360214e06ff94ade /move
parentab91272887d7b83601a4e37ff989b49445ed3c73 (diff)
downloaddrakx-backup-do-not-use-92db4f7f8a0133d4878633796638180e25f94bd0.tar
drakx-backup-do-not-use-92db4f7f8a0133d4878633796638180e25f94bd0.tar.gz
drakx-backup-do-not-use-92db4f7f8a0133d4878633796638180e25f94bd0.tar.bz2
drakx-backup-do-not-use-92db4f7f8a0133d4878633796638180e25f94bd0.tar.xz
drakx-backup-do-not-use-92db4f7f8a0133d4878633796638180e25f94bd0.zip
oops, fix the "Continue without USB key" case
Diffstat (limited to 'move')
-rw-r--r--move/move.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/move/move.pm b/move/move.pm
index 85616d0ff..625a01ad8 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -462,7 +462,8 @@ Operating System.");
cancel => N("Continue without USB key") }) or return;
}
- 0;
+ key_mount($o, 'reread');
+ check_key($o);
}
sub install2::verifyKey {
@@ -470,9 +471,7 @@ sub install2::verifyKey {
log::l("automatic transparent key support is disabled"), return if $key_disabled;
- while (!check_key($o)) {
- key_mount($o, 'reread');
- }
+ check_key($o) or return;
my $_wait = $using_existing_host_config
|| $o->wait_message(N("Setting up USB key"), N("Please wait, setting up system configuration files on USB key..."));