From 598d3b338509b0453799bcd65d2f0c57cbb68dd0 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 6 Nov 2009 12:09:35 +0000 Subject: rename install_usb_bootloader as install_disk_bootloader --- draklive | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'draklive') diff --git a/draklive b/draklive index 08644b3..1e6a331 100755 --- a/draklive +++ b/draklive @@ -894,7 +894,7 @@ EOG chmod 0755, $live->{mnt} . $grub_script; } -sub install_usb_bootloader { +sub install_disk_bootloader { my ($live, $media, $boot_device, $opts) = @_; return if $live->{system}{skip_bootloader_install}; @@ -980,7 +980,7 @@ sub record_usb_master { rm_rf($live->{mnt} . $media_boot) if -e $live->{mnt} . $media_boot; cp_af($live->get_builddir . $live->{prefix}{build}{boot}, $live->{mnt} . $media_boot); - install_usb_bootloader($live, $media, $slash->{real_device}, $opts); + install_disk_bootloader($live, $media, $slash->{real_device}, $opts); do { my $loopbacks_source = $live->get_builddir . $live->{prefix}{build}{loopbacks} . '/'; @@ -1051,7 +1051,7 @@ sub record_harddisk_master { my $boot_idx = $media->find_boot_partition_index; my $boot_part = $media->{partitions}[$boot_idx]; - install_usb_bootloader($live, $media, $boot_part->{real_device}, $opts); + install_disk_bootloader($live, $media, $boot_part->{real_device}, $opts); foreach my $part (sort { $b->{mntpoint} cmp $a->{mntpoint} } @partitions) { run_('umount', $part->{real_device}); @@ -1286,7 +1286,7 @@ 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_usb_bootloader($live, $media, $slash->{real_device}, $opts); + 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"); -- cgit v1.2.1