diff options
author | Olivier Blin <oblin@mandriva.com> | 2008-11-12 14:20:05 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2008-11-12 14:20:05 +0000 |
commit | 84be0092302e62e823b0827d8a080ff6801c4cda (patch) | |
tree | 823920dc2a7ea7fd80a227eef0c09ade178b9a59 | |
parent | 87605d8be1c3e4939f208c4df271fae7cfb89eec (diff) | |
download | draklive-84be0092302e62e823b0827d8a080ff6801c4cda.tar draklive-84be0092302e62e823b0827d8a080ff6801c4cda.tar.gz draklive-84be0092302e62e823b0827d8a080ff6801c4cda.tar.bz2 draklive-84be0092302e62e823b0827d8a080ff6801c4cda.tar.xz draklive-84be0092302e62e823b0827d8a080ff6801c4cda.zip |
factorize remaining grub device map usage
-rwxr-xr-x | draklive | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -743,7 +743,6 @@ sub install_usb_bootloader { my $bootloader = $media->get_boot_setting('bootloader', $opts); member($bootloader, 'grub', 'syslinux') or die "no bootloader defined in media configuration\n"; - my $grub_device_map = $live->{mnt} . $media_boot . "/grub/device.map"; if ($bootloader eq 'syslinux') { cp_f($live->get_builddir . $_, $live->{mnt}) foreach map { $live->{prefix}{boot} . $_; @@ -754,7 +753,6 @@ sub install_usb_bootloader { mkdir_p($live->{mnt} . $media_boot . '/grub'); cp_f($live->get_builddir . $live->{prefix}{build}{boot} . '/gfxmenu', $live->{mnt} . $media_boot); output_p($live->{mnt} . $media_boot . '/grub/menu.lst', build_grub_cfg($live, $media, $opts, $device)); - unlink $grub_device_map; } if (-b $device) { @@ -778,14 +776,16 @@ sub install_usb_bootloader { s!^\s*grub_prefix=/boot/!grub_prefix=${media_boot}/!; s!^\s*bootdir=(.*)/boot$!bootdir=$1${media_boot}!; } $local_grub_install; + my $grub_device_map = $live->{mnt} . $media_boot . "/grub/device.map"; + unlink $grub_device_map; foreach ($master_device, $device) { run_($local_grub_install, '--root-directory=' . $live->{mnt}, '--no-floppy', $_) or die "unable to run grub on $device\n"; } + unlink $grub_device_map; } else { install_grub_to_image($live, $master_device); } - unlink $grub_device_map; } } else { warn "not running $bootloader on non block device $device\n"; |