summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2010-08-30 16:40:41 +0000
committerOlivier Blin <oblin@mandriva.com>2010-08-30 16:40:41 +0000
commit9c38f256b5f3e9f7c6186c14c6f3ab38be04881d (patch)
tree45f3709adbf2997afd66063dc2b3205f8c3c0a5b
parent4f87385d022968e97b0763e52247eb356c12927a (diff)
downloaddrakiso-9c38f256b5f3e9f7c6186c14c6f3ab38be04881d.tar
drakiso-9c38f256b5f3e9f7c6186c14c6f3ab38be04881d.tar.gz
drakiso-9c38f256b5f3e9f7c6186c14c6f3ab38be04881d.tar.bz2
drakiso-9c38f256b5f3e9f7c6186c14c6f3ab38be04881d.tar.xz
drakiso-9c38f256b5f3e9f7c6186c14c6f3ab38be04881d.zip
extract get_cdrom_replicator_path
-rwxr-xr-xdraklive10
1 files 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,