From 9c38f256b5f3e9f7c6186c14c6f3ab38be04881d Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 30 Aug 2010 16:40:41 +0000 Subject: extract get_cdrom_replicator_path --- draklive | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/draklive b/draklive index fdcb21f..1aae255 100755 --- a/draklive +++ b/draklive @@ -665,6 +665,13 @@ sub get_cdrom_master_path { $live->get_builddir . $live->{prefix}{build}{dist} . '/' . $live->get_name . ($opts->{boot} && "-boot-$opts->{boot}") . '.iso'; } +sub get_cdrom_replicator_path { + my ($live) = @_; + my $path = get_disk_replicator_path($live); + $path =~ s/.img$/.iso/; + $path; +} + sub create_cdrom_master { my ($live, $opts) = @_; my $label = $live->{media}->get_media_label or die "the source device must be described by a label\n"; @@ -1356,8 +1363,7 @@ sub create_cdrom_replicator { output_p($syslinux_cfg, build_syslinux_cfg($live, $live->{replicator}{media}, $opts)); my $label = $live->{replicator}{media}->get_media_label or die "the source device must be described by a label\n"; - my $dest = get_disk_replicator_path($live); - $dest =~ s/.img$/.iso/; + my $dest = get_cdrom_replicator_path($live); build_iso_image( $live, $opts, $dest, -- cgit v1.2.1