summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-10-13 14:01:26 +0000
committerOlivier Blin <oblin@mandriva.com>2009-10-13 14:01:26 +0000
commit412a9c9d6a09f407d3d8afce8f268761bda830f3 (patch)
tree91fd85e78941e89e1cb93dabb452b5b0863ff4ff
parentd76afd78de4da1607adcc3cb15729ab16557b704 (diff)
downloaddraklive-412a9c9d6a09f407d3d8afce8f268761bda830f3.tar
draklive-412a9c9d6a09f407d3d8afce8f268761bda830f3.tar.gz
draklive-412a9c9d6a09f407d3d8afce8f268761bda830f3.tar.bz2
draklive-412a9c9d6a09f407d3d8afce8f268761bda830f3.tar.xz
draklive-412a9c9d6a09f407d3d8afce8f268761bda830f3.zip
pass live and opts to build_iso_image
-rwxr-xr-xdraklive4
1 files changed, 3 insertions, 1 deletions
diff --git a/draklive b/draklive
index e4d6133..a160e05 100755
--- a/draklive
+++ b/draklive
@@ -626,6 +626,7 @@ sub create_cdrom_master {
mkdir_p(dirname($dest));
}
build_iso_image(
+ $live, $opts,
$dest,
$live->get_builddir . $live->{prefix}{build}{boot} . '/syslinux',
$live->get_builddir . $live->{prefix}{build}{boot} . get_syslinux_path($live->{media}, $opts),
@@ -647,7 +648,7 @@ sub create_cdrom_master {
}
sub build_iso_image {
- my ($dest, $o_isolinux_path, $isolinux_cfg, $label, @opts) = @_;
+ my ($live, $opts, $dest, $boot_dir, $o_isolinux_path, $isolinux_cfg, $label, @opts) = @_;
my $progress = MDV::Draklive::Progress->new(100, time());
my $in_progress;
@@ -1288,6 +1289,7 @@ sub create_cdrom_replicator {
my $dest = get_disk_replicator_path($live);
$dest =~ s/.img$/.iso/;
build_iso_image(
+ $live, $opts,
$dest,
$live->get_builddir . $live->{prefix}{build}{boot} . '/syslinux',
$syslinux_cfg,