summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-04-11 12:38:23 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-04-11 12:38:23 +0000
commit36fd2f4ddb613aecd0284732882c49de6c2d1cb8 (patch)
tree441314e499cd6656ef467b3e63e0f8f9168bec10
parent0bd61fb28d791c2ceb6b390b7f2f651274158bf6 (diff)
downloaddrakx-36fd2f4ddb613aecd0284732882c49de6c2d1cb8.tar
drakx-36fd2f4ddb613aecd0284732882c49de6c2d1cb8.tar.gz
drakx-36fd2f4ddb613aecd0284732882c49de6c2d1cb8.tar.bz2
drakx-36fd2f4ddb613aecd0284732882c49de6c2d1cb8.tar.xz
drakx-36fd2f4ddb613aecd0284732882c49de6c2d1cb8.zip
make it work (why was bootloader::install commented?)
-rwxr-xr-xperl-install/standalone/drakboot6
1 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index cc376e398..b1d47924c 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -31,8 +31,6 @@ sub lilo_choice
my $bootloader = bootloader::read('', '/etc/lilo.conf');
local ($_) = `detectloader`;
$bootloader->{methods} = { lilo => 1, grub => !!/grub/i };
- print $bootloader . "\n";
-
my ($hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
my $fstab = [ fsedit::get_fstab(@$hds) ];
@@ -42,12 +40,12 @@ sub lilo_choice
ask:
any::setupBootloader($in, $bootloader, $hds, $fstab, $ENV{SECURE_LEVEL}) or $in->exit(0);
- #eval { bootloader::install('', $bootloader, $fstab, $hds) };
+ eval { bootloader::install('', $bootloader, $fstab, $hds) };
if ($@) {
$in->ask_warn('',
[ _("Installation of LILO failed. The following error occured:"),
- grep { !/^Warning:/ } cat_("/tmp/.error") ]);
+ grep { !/^Warning:/ } cat_("/tmp/.error") ]);
unlink "/tmp/.error";
goto ask;
}