summaryrefslogtreecommitdiffstats
path: root/draklive
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-06-29 13:14:19 +0000
committerOlivier Blin <oblin@mandriva.com>2009-06-29 13:14:19 +0000
commit1088ca9d191192c3a2f154f30a084ca147874467 (patch)
tree7553e044ea4fcc25a769235cb0c86e470be60d05 /draklive
parent94133e91e21fb060848e2a08947563dd37e1d46d (diff)
downloaddrakiso-1088ca9d191192c3a2f154f30a084ca147874467.tar
drakiso-1088ca9d191192c3a2f154f30a084ca147874467.tar.gz
drakiso-1088ca9d191192c3a2f154f30a084ca147874467.tar.bz2
drakiso-1088ca9d191192c3a2f154f30a084ca147874467.tar.xz
drakiso-1088ca9d191192c3a2f154f30a084ca147874467.zip
pass media to install_grub_to_image
Diffstat (limited to 'draklive')
-rwxr-xr-xdraklive6
1 files changed, 3 insertions, 3 deletions
diff --git a/draklive b/draklive
index 92e9b13..70e08fd 100755
--- a/draklive
+++ b/draklive
@@ -777,7 +777,7 @@ sub record_cdrom_master {
}
sub install_grub_to_image {
- my ($live, $img) = @_;
+ my ($live, $media, $img) = @_;
my $grub_dir = "/boot/grub";
my $grub_script = $grub_dir . "/install.sh";
mkdir_p($live->{mnt} . $grub_dir);
@@ -851,7 +851,7 @@ sub install_usb_bootloader {
}
unlink $grub_device_map;
} else {
- install_grub_to_image($live, $master_device);
+ install_grub_to_image($live, $media, $master_device);
}
}
} else {
@@ -939,7 +939,7 @@ sub record_harddisk_master {
}
} unless $opts->{boot_only};
- install_grub_to_image($live, $opts->{disk_device});
+ install_grub_to_image($live, $media, $opts->{disk_device});
run_('umount', $live->{mnt});
maybe_umount_device($device);