summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2010-10-09 16:36:50 +0000
committerOlivier Blin <oblin@mandriva.com>2010-10-09 16:36:50 +0000
commit8b41833ff3f2dcc2b91d41533bbdd51acdf58a4d (patch)
tree085762f70cb09ead84e7e75dc97f8163b406ceb3
parent9c44767b4860822dbfc69222786a48ff9b7e616e (diff)
downloaddraklive-8b41833ff3f2dcc2b91d41533bbdd51acdf58a4d.tar
draklive-8b41833ff3f2dcc2b91d41533bbdd51acdf58a4d.tar.gz
draklive-8b41833ff3f2dcc2b91d41533bbdd51acdf58a4d.tar.bz2
draklive-8b41833ff3f2dcc2b91d41533bbdd51acdf58a4d.tar.xz
draklive-8b41833ff3f2dcc2b91d41533bbdd51acdf58a4d.zip
extract get_disk_replicator_prefix
-rwxr-xr-xdraklive11
1 files 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 {