From 8b41833ff3f2dcc2b91d41533bbdd51acdf58a4d Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Sat, 9 Oct 2010 16:36:50 +0000 Subject: extract get_disk_replicator_prefix --- draklive | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/draklive b/draklive index 23e679f..aca97de 100755 --- a/draklive +++ b/draklive @@ -667,9 +667,7 @@ sub get_cdrom_master_path { sub get_cdrom_replicator_path { my ($live) = @_; - my $path = get_disk_replicator_path($live); - $path =~ s/.img$/.iso/; - $path; + get_disk_replicator_prefix($live) . ".iso"; } sub create_cdrom_master { @@ -1332,9 +1330,14 @@ sub record_oem_rescue { devices::del_loop($oem_rescue->{real_device}) if -f $hd->{file}; } +sub get_disk_replicator_prefix { + my ($live) = @_; + $live->get_builddir . $live->{prefix}{build}{dist} . '/' . $live->get_name . '.rest'; +} + sub get_disk_replicator_path { my ($live) = @_; - $live->get_builddir . $live->{prefix}{build}{dist} . '/' . $live->get_name . '.rest.img'; + get_disk_replicator_prefix($live) . ".img"; } sub get_disk_replicator_files { -- cgit v1.2.1