diff options
| author | Olivier Blin <oblin@mandriva.org> | 2006-03-05 19:55:35 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2006-03-05 19:55:35 +0000 |
| commit | 7cf61db5e27cd7ad1a39a0b1f408783a54ef735a (patch) | |
| tree | 63d8d276ac1a07b3835a5bf5227b00c736a4236f | |
| parent | b96b744bf2f8dbf400de93aad165d89cb0c34aa9 (diff) | |
| download | drakx-7cf61db5e27cd7ad1a39a0b1f408783a54ef735a.tar drakx-7cf61db5e27cd7ad1a39a0b1f408783a54ef735a.tar.gz drakx-7cf61db5e27cd7ad1a39a0b1f408783a54ef735a.tar.bz2 drakx-7cf61db5e27cd7ad1a39a0b1f408783a54ef735a.tar.xz drakx-7cf61db5e27cd7ad1a39a0b1f408783a54ef735a.zip | |
simplify
| -rwxr-xr-x | tools/draklive | 8 |
1 files changed, 4 insertions, 4 deletions
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}, |