From 7cf61db5e27cd7ad1a39a0b1f408783a54ef735a Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Sun, 5 Mar 2006 19:55:35 +0000
Subject: simplify
---
tools/draklive | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'tools')
diff --git a/tools/draklive b/tools/draklive
index 17032095e..c2ecfab20 100755
--- a/tools/draklive
+++ b/tools/draklive
@@ -615,10 +615,10 @@ sub get_cdrom_master_path {
sub create_cdrom_master {
my ($live, $media, $opts) = @_;
my $label = get_media_label($media) or die "the source device must be described by a label";
- my @dest;
+ my $dest;
unless ($opts->{onthefly}) {
- @dest = ('-o', get_cdrom_master_path($live, $opts));
- mkdir_p(dirname($dest[1]));
+ $dest = get_cdrom_master_path($live, $opts);
+ mkdir_p(dirname($dest));
}
run_('mkisofs', '-pad', '-l', '-R', '-J', '-v', '-v',
'-V', $label, #'-A', $application, '-p', $preparer, '-P', $publisher,
@@ -627,7 +627,7 @@ sub create_cdrom_master {
'-hide-rr-moved', '-no-emul-boot',
'-boot-load-size', 4, '-boot-info-table',
'-graft-points',
- @dest,
+ if_($dest, '-o', $dest),
'isolinux/isolinux.bin=/usr/lib/syslinux/isolinux-graphic.bin',
'isolinux/isolinux.cfg=' . get_workdir($live) . get_syslinux_path($live, $media, $opts->{boot_only}),
$live->{prefix}{boot} . '=' . get_workdir($live) . $live->{prefix}{boot},
--
cgit v1.2.1