summaryrefslogtreecommitdiffstats
path: root/draklive
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-11-18 14:02:53 +0000
committerOlivier Blin <oblin@mandriva.com>2009-11-18 14:02:53 +0000
commit2f3e7895b8cfdd07a0ce331a1190bc87383563d7 (patch)
tree0587529527c1d2b5ff29234db1bab700058b264c /draklive
parent57f8c033f132b309cfb77309b7aaa552d8c89041 (diff)
downloaddrakiso-2f3e7895b8cfdd07a0ce331a1190bc87383563d7.tar
drakiso-2f3e7895b8cfdd07a0ce331a1190bc87383563d7.tar.gz
drakiso-2f3e7895b8cfdd07a0ce331a1190bc87383563d7.tar.bz2
drakiso-2f3e7895b8cfdd07a0ce331a1190bc87383563d7.tar.xz
drakiso-2f3e7895b8cfdd07a0ce331a1190bc87383563d7.zip
write bootloader config for replicator media
Diffstat (limited to 'draklive')
-rwxr-xr-xdraklive7
1 files changed, 5 insertions, 2 deletions
diff --git a/draklive b/draklive
index 212b727..4bc33d2 100755
--- a/draklive
+++ b/draklive
@@ -911,7 +911,7 @@ sub install_disk_bootloader {
$live->{prefix}{boot} . $_;
} get_syslinux_path($media, $opts), $media->get_initrd_path, @syslinux_boot_files;
} elsif ($bootloader eq 'grub') {
- if (need_media_specific_boot($live)) {
+ if (need_media_specific_boot($live) || $opts->{force_bootloader_config}) {
#- FIXME: add get_grub_path (when building boot configuration files)
# and get_bootloader_path (when copying)
mkdir_p($live->{mnt} . $media_boot . '/grub');
@@ -1266,7 +1266,10 @@ sub record_usb_replicator {
run_('mount', $slash->{real_device}, $live->{mnt})
or die "unable to mount $slash->{real_device}\n";
rm_rf($live->{mnt} . $media_boot) if -e $live->{mnt} . $media_boot;
- install_disk_bootloader($live, $media, $slash->{real_device}, $opts);
+ {
+ local $opts->{force_bootloader_config} = 1;
+ install_disk_bootloader($live, $media, $slash->{real_device}, $opts);
+ }
record_rescue_files($live->{mnt}, $slash->{real_device}, [ get_disk_replicator_files($live) ]);
output_p($live->{mnt} . "/images/list", "EN,English," . basename(get_disk_image_path($live)) . ",on\n");