take replicator media from config

1 files changed, 2 insertions, 7 deletions

diff --git a/draklive b/draklive
index f2d94d0..01911eb 100755
--- a/draklive
+++ b/draklive
@@ -1672,15 +1672,10 @@ sub get_disk_replicator_path {
     get_builddir($live) . $live->{prefix}{build}{dist} . '/' . get_live_name($live) . '.rest.img';
 }
 
-sub get_disk_replicator_media() {
-    { storage => 'usb', bootloader => 'grub' };
-}
-
 sub get_disk_replicator_files {
     my ($live) = @_;
-    my $media = get_disk_replicator_media();
     my $media_boot = get_media_prefix($live, 'boot');
-    my $initrd = $media_boot . get_initrd_path($media);
+    my $initrd = $media_boot . get_initrd_path($live->{replicator}{media});
     (
         '/usr/lib/drakx-installer-images/isolinux/alt0/vmlinuz' => $media_boot . '/vmlinuz',
         '/usr/lib/drakx-installer-images/isolinux/alt0/all.rdz' => $initrd,
@@ -1702,7 +1697,7 @@ sub create_disk_replicator_usb {
 
 sub record_disk_replicator_usb {
     my ($live, $opts) = @_;
-    my $media = get_disk_replicator_media();
+    my $media = $live->{replicator}{media};
     my $media_boot = get_media_prefix($live, 'boot');
     my $device = get_media_device($live, $opts)
       or die "unable to find recording device (missing label? try with --device <device>)\n";