summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-21 18:40:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-21 18:40:26 +0000
commit841e3d34a601bb0bef26a57668533bc38ac92a04 (patch)
tree6fdadace41d53f62ebb178a1fc83cd2ebff3aabb /perl-install
parent54840a56fcf8dbc066dff91142d943c0b4d4eddf (diff)
downloaddrakx-backup-do-not-use-841e3d34a601bb0bef26a57668533bc38ac92a04.tar
drakx-backup-do-not-use-841e3d34a601bb0bef26a57668533bc38ac92a04.tar.gz
drakx-backup-do-not-use-841e3d34a601bb0bef26a57668533bc38ac92a04.tar.bz2
drakx-backup-do-not-use-841e3d34a601bb0bef26a57668533bc38ac92a04.tar.xz
drakx-backup-do-not-use-841e3d34a601bb0bef26a57668533bc38ac92a04.zip
(g_default_packages): nice warning if mount in vfat fails
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 3868f3bba..b07038609 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -581,9 +581,13 @@ sub g_default_packages {
my $floppy = detect_devices::floppy();
- $o->ask_okcancel('', _("Insert a FAT formatted floppy in drive %s", $floppy), 1) or return;
+ while (1) {
+ $o->ask_okcancel('', _("Insert a FAT formatted floppy in drive %s", $floppy), 1) or return;
- fs::mount(devices::make($floppy), "/floppy", "vfat", 0);
+ eval { fs::mount(devices::make($floppy), "/floppy", "vfat", 0) };
+ last if !$@;
+ $o->ask_warn('', _("This floppy is not FAT formatted"));
+ }
require Data::Dumper;
output('/floppy/auto_inst.cfg',