diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-08-25 11:35:34 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-08-25 11:35:34 +0000 |
| commit | da0b88e010daefea848db64d860947109d8bde1d (patch) | |
| tree | 9b04565ae0eb3b611c5d955bc20c97b68b7be9dd /perl-install | |
| parent | 65b74104e773b7140a91775e7456dc12d64797ab (diff) | |
| download | drakx-backup-do-not-use-da0b88e010daefea848db64d860947109d8bde1d.tar drakx-backup-do-not-use-da0b88e010daefea848db64d860947109d8bde1d.tar.gz drakx-backup-do-not-use-da0b88e010daefea848db64d860947109d8bde1d.tar.bz2 drakx-backup-do-not-use-da0b88e010daefea848db64d860947109d8bde1d.tar.xz drakx-backup-do-not-use-da0b88e010daefea848db64d860947109d8bde1d.zip | |
install grub stage files in install_grub(), not write_grub() (bugzilla #17830) (thanks to herton)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/bootloader.pm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index d6a384d0a..4cd2be611 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1274,11 +1274,6 @@ sub grub2file { sub write_grub { my ($bootloader, $all_hds) = @_; - { - my @files = grep { /(stage1|stage2|_stage1_5)$/ } glob("$::prefix/lib/grub/*/*"); - cp_af(@files, "$::prefix/boot/grub"); - } - my $fstab = [ fs::get::fstab($all_hds) ]; my @legacy_floppies = detect_devices::floppies(); my @sorted_hds = sort_hds_according_to_bios($bootloader, $all_hds); @@ -1385,7 +1380,11 @@ sub install_grub { write_grub($bootloader, $all_hds); - install_raw_grub() if !$::testing; + if (!$::testing) { + my @files = grep { /(stage1|stage2|_stage1_5)$/ } glob("$::prefix/lib/grub/*/*"); + cp_af(@files, "$::prefix/boot/grub"); + install_raw_grub() + } configure_kdm_BootManager('Grub'); } |