From 8cffced6747a4e8846788e51cb5bd856fac810d2 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 6 Nov 2009 12:08:38 +0000 Subject: do not overwrite grub conf for "classical" boot when installing bootloader --- draklive | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/draklive b/draklive index 26256e6..e8694f9 100755 --- a/draklive +++ b/draklive @@ -909,11 +909,13 @@ sub install_usb_bootloader { $live->{prefix}{boot} . $_; } get_syslinux_path($media, $opts), $media->get_initrd_path, @syslinux_boot_files; } elsif ($bootloader eq 'grub') { - #- FIXME: add get_grub_path (when building boot configuration files) - # and get_bootloader_path (when copying) - mkdir_p($live->{mnt} . $media_boot . '/grub'); - cp_f($live->get_builddir . $live->{prefix}{build}{boot} . '/gfxmenu', $live->{mnt} . $media_boot) if $live->{system}{gfxboot}; - output_p($live->{mnt} . $media_boot . '/grub/menu.lst', build_grub_cfg($live, $media, $opts, $boot_device)); + if (need_compressed_image($live)) { + #- FIXME: add get_grub_path (when building boot configuration files) + # and get_bootloader_path (when copying) + mkdir_p($live->{mnt} . $media_boot . '/grub'); + cp_f($live->get_builddir . $live->{prefix}{build}{boot} . '/gfxmenu', $live->{mnt} . $media_boot) if $live->{system}{gfxboot}; + output_p($live->{mnt} . $media_boot . '/grub/menu.lst', build_grub_cfg($live, $media, $opts, $boot_device)); + } } if (-b $boot_device) { -- cgit v1.2.1