summaryrefslogtreecommitdiffstats
path: root/draklive
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-09-15 12:29:44 +0000
committerOlivier Blin <oblin@mandriva.com>2009-09-15 12:29:44 +0000
commit46348c0a9a47a967c1c018ac0454b4afffe72d5f (patch)
tree499755a1f74d366d43417d3b409a5b4a964e69a4 /draklive
parent2a080f34d9d201a323f2e89011081415190c3a5d (diff)
downloaddrakiso-46348c0a9a47a967c1c018ac0454b4afffe72d5f.tar
drakiso-46348c0a9a47a967c1c018ac0454b4afffe72d5f.tar.gz
drakiso-46348c0a9a47a967c1c018ac0454b4afffe72d5f.tar.bz2
drakiso-46348c0a9a47a967c1c018ac0454b4afffe72d5f.tar.xz
drakiso-46348c0a9a47a967c1c018ac0454b4afffe72d5f.zip
pass opts 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 65e50ea..2c15362 100755
--- a/draklive
+++ b/draklive
@@ -850,7 +850,7 @@ sub record_cdrom_master {
}
sub install_grub_to_image {
- my ($live, $media, $img) = @_;
+ my ($live, $media, $img, $opts) = @_;
my $grub_dir = "/boot/grub";
my $grub_script = $grub_dir . "/install.sh";
mkdir_p($live->{mnt} . $grub_dir);
@@ -924,7 +924,7 @@ sub install_usb_bootloader {
}
unlink $grub_device_map;
} else {
- install_grub_to_image($live, $media, $master_device);
+ install_grub_to_image($live, $media, $master_device, $opts);
}
}
} else {
@@ -1033,7 +1033,7 @@ sub record_harddisk_master {
or last;
} unless $opts->{boot_only};
- install_grub_to_image($live, $media, $hd->{file});
+ install_grub_to_image($live, $media, $hd->{file}, $opts);
foreach my $part (sort { $b->{mntpoint} cmp $a->{mntpoint} } @partitions) {
run_('umount', $part->{real_device});