From a4231668b083563d3fd60f687155dd45f783cda1 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 13 Oct 2009 14:16:16 +0000
Subject: do not make isolinux path optional

---
 draklive | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'draklive')

diff --git a/draklive b/draklive
index 9c253ea..e3d2de7 100755
--- a/draklive
+++ b/draklive
@@ -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",
-- 
cgit v1.2.1