summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-04-10 15:08:58 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-04-10 15:08:58 +0000
commitb0296a8796a3e3baba2400c8c37e9427ebd0a48b (patch)
tree4cf1fe62f30b4910790e39a3ceb6e74c8b3733d7
parent23119950049cfd1d37c7d9c9c8f0a4aa76e7ed51 (diff)
downloaddrakx-backup-do-not-use-b0296a8796a3e3baba2400c8c37e9427ebd0a48b.tar
drakx-backup-do-not-use-b0296a8796a3e3baba2400c8c37e9427ebd0a48b.tar.gz
drakx-backup-do-not-use-b0296a8796a3e3baba2400c8c37e9427ebd0a48b.tar.bz2
drakx-backup-do-not-use-b0296a8796a3e3baba2400c8c37e9427ebd0a48b.tar.xz
drakx-backup-do-not-use-b0296a8796a3e3baba2400c8c37e9427ebd0a48b.zip
any::setupBootloader() already call bootloader::install()
-rwxr-xr-xperl-install/standalone/drakboot9
1 files changed, 3 insertions, 6 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 81f566b4d..f83a9ec16 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -1,9 +1,9 @@
#!/usr/bin/perl
# DrakBoot
-
+# $Id$
# Copyright (C) 2001-2003 MandrakeSoft
-# Yves Duret
+# Yves Duret, Thierry Vignaud
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -328,10 +328,7 @@ sub lilo_choice {
ask:
local $::isEmbedded = 0;
- eval {
- any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL});
- bootloader::install($bootloader, $fstab, $all_hds->{hds});
- };
+ eval { any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}) };
my $loader = arch() =~ /ppc/ ? "Yaboot" : "LILO";
my $err = $@;
if ($err) {