From 84be0092302e62e823b0827d8a080ff6801c4cda Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 12 Nov 2008 14:20:05 +0000
Subject: factorize remaining grub device map usage

---
 draklive | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'draklive')

diff --git a/draklive b/draklive
index 44555ce..1abe96e 100755
--- a/draklive
+++ b/draklive
@@ -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";
-- 
cgit v1.2.1