diff options
| author | damien <damien@mandriva.com> | 2001-04-11 16:38:56 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-04-11 16:38:56 +0000 |
| commit | b5f6b381c4778cf2c606e16a8ce7f3f967b6ca14 (patch) | |
| tree | ce11b40d2f840bf17b3126a7bfc08674ffcaf680 | |
| parent | d29939c0717ed5110e615dacd8452aea625a0b4e (diff) | |
| download | drakx-b5f6b381c4778cf2c606e16a8ce7f3f967b6ca14.tar drakx-b5f6b381c4778cf2c606e16a8ce7f3f967b6ca14.tar.gz drakx-b5f6b381c4778cf2c606e16a8ce7f3f967b6ca14.tar.bz2 drakx-b5f6b381c4778cf2c606e16a8ce7f3f967b6ca14.tar.xz drakx-b5f6b381c4778cf2c606e16a8ce7f3f967b6ca14.zip | |
corrected
| -rw-r--r-- | perl-install/bootlook.pm | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm index 9f0b90b3b..e98f5083e 100644 --- a/perl-install/bootlook.pm +++ b/perl-install/bootlook.pm @@ -31,7 +31,6 @@ use standalone; use common qw(:common :file :functional :system); use my_gtk qw(:helpers :wrappers); use any; -use Data::Dumper; setlocale (LC_ALL, ""); Locale::GetText::textdomain ("Bootlookdrake"); @@ -408,16 +407,16 @@ sub lilo_choice fs::get_mntpoints_from_fstab($fstab); $::expert=1; -# ask: - print Data::Dumper->Dump([$in],['$in']), "\n", Data::Dumper->Dump([$hds],['$hds']), "\n"; - + ask: + $::isEmbedded = 0; any::setupBootloader($in, $bootloader, $hds, $fstab, $ENV{SECURE_LEVEL}) or $in->exit(0); -# eval { bootloader::install('', $bootloader, $fstab, $hds) }; -# if ($@) { -# $in->ask_warn('', -# [ _("Installation of LILO failed. The following error occured:"), -# grep { !/^Warning:/ } cat_("/tmp/.error") ]); -# unlink "/tmp/.error"; -# goto ask; -# } + eval { bootloader::install('', $bootloader, $fstab, $hds) }; + if ($@) { + $in->ask_warn('', + [ _("Installation of LILO failed. The following error occured:"), + grep { !/^Warning:/ } cat_("/tmp/.error") ]); + unlink "/tmp/.error"; + goto ask; + } + $::isEmbedded = 0; } |