diff options
author | Olivier Blin <oblin@mandriva.com> | 2009-10-13 14:16:16 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2009-10-13 14:16:16 +0000 |
commit | a4231668b083563d3fd60f687155dd45f783cda1 (patch) | |
tree | bb8d4abf23c918bfd464634d575ec08d3c349a36 | |
parent | f14e82c2d6d46952752b12c1baf4f6f061d52f60 (diff) | |
download | drakiso-a4231668b083563d3fd60f687155dd45f783cda1.tar drakiso-a4231668b083563d3fd60f687155dd45f783cda1.tar.gz drakiso-a4231668b083563d3fd60f687155dd45f783cda1.tar.bz2 drakiso-a4231668b083563d3fd60f687155dd45f783cda1.tar.xz drakiso-a4231668b083563d3fd60f687155dd45f783cda1.zip |
do not make isolinux path optional
-rwxr-xr-x | draklive | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -628,7 +628,6 @@ sub create_cdrom_master { 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), $label, if_(!$opts->{boot_only}, @@ -647,7 +646,7 @@ sub create_cdrom_master { } sub build_iso_image { - my ($live, $opts, $dest, $o_isolinux_path, $isolinux_cfg, $label, @opts) = @_; + my ($live, $opts, $dest, $isolinux_cfg, $label, @opts) = @_; my $progress = MDV::Draklive::Progress->new(100, time()); my $in_progress; @@ -672,7 +671,7 @@ sub build_iso_image { '-graft-points', if_($dest, '-o', $dest), $live->get_media_prefix('boot', $opts->{boot}) . '=' . $live->get_builddir . $live->{prefix}{build}{boot}, - if_($o_isolinux_path, 'isolinux=' . $o_isolinux_path), + 'isolinux=' . $live->get_builddir . $live->{prefix}{build}{boot} . '/syslinux', 'isolinux/isolinux.cfg=' . $isolinux_cfg, 'isolinux/isolinux.bin=/usr/lib/syslinux/isolinux.bin', 'isolinux/gfxboot.com=/usr/lib/syslinux/gfxboot.com', @@ -1291,7 +1290,6 @@ sub create_cdrom_replicator { build_iso_image( $live, $opts, $dest, - $live->get_builddir . $live->{prefix}{build}{boot} . '/syslinux', $syslinux_cfg, $label, "/images/list=$images_list", |