summaryrefslogtreecommitdiffstats
path: root/draklive
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-11-06 12:09:35 +0000
committerOlivier Blin <oblin@mandriva.com>2009-11-06 12:09:35 +0000
commit598d3b338509b0453799bcd65d2f0c57cbb68dd0 (patch)
tree00eb4303b62a87fb8c37a8e791c2e2335143c0d4 /draklive
parent97cdb6248d13f2396a89ec66c57320e0ba9018d8 (diff)
downloaddrakiso-598d3b338509b0453799bcd65d2f0c57cbb68dd0.tar
drakiso-598d3b338509b0453799bcd65d2f0c57cbb68dd0.tar.gz
drakiso-598d3b338509b0453799bcd65d2f0c57cbb68dd0.tar.bz2
drakiso-598d3b338509b0453799bcd65d2f0c57cbb68dd0.tar.xz
drakiso-598d3b338509b0453799bcd65d2f0c57cbb68dd0.zip
rename install_usb_bootloader as install_disk_bootloader
Diffstat (limited to 'draklive')
-rwxr-xr-xdraklive8
1 files changed, 4 insertions, 4 deletions
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");