summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-12-24 01:05:45 +0000
committerOlivier Blin <oblin@mandriva.com>2008-12-24 01:05:45 +0000
commitcc594bb251691c2b66eed08692bf1f814cc169d1 (patch)
tree25c1c8efd445867f858680941886013679522eb1
parent4964b52fce46ea529912a8ca225d4b4fcf7155f6 (diff)
downloaddraklive-cc594bb251691c2b66eed08692bf1f814cc169d1.tar
draklive-cc594bb251691c2b66eed08692bf1f814cc169d1.tar.gz
draklive-cc594bb251691c2b66eed08692bf1f814cc169d1.tar.bz2
draklive-cc594bb251691c2b66eed08692bf1f814cc169d1.tar.xz
draklive-cc594bb251691c2b66eed08692bf1f814cc169d1.zip
make isolinux folder optional
-rwxr-xr-xdraklive4
1 files changed, 2 insertions, 2 deletions
diff --git a/draklive b/draklive
index 94a1192..f7aa8ea 100755
--- a/draklive
+++ b/draklive
@@ -559,7 +559,7 @@ sub create_cdrom_master {
}
sub build_iso_image {
- my ($dest, $isolinux_path, $isolinux_cfg, $label, @opts) = @_;
+ my ($dest, $o_isolinux_path, $isolinux_cfg, $label, @opts) = @_;
my $progress = MDV::Draklive::Progress->new(100, time());
my $in_progress;
@@ -583,7 +583,7 @@ sub build_iso_image {
'-boot-load-size', 4, '-boot-info-table',
'-graft-points',
if_($dest, '-o', $dest),
- 'isolinux=' . $isolinux_path,
+ if_($o_isolinux_path, 'isolinux=' . $o_isolinux_path),
'isolinux/isolinux.cfg=' . $isolinux_cfg,
'isolinux/isolinux.bin=/usr/lib/syslinux/isolinux.bin',
@opts,