summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdraklive28
-rw-r--r--lib/MDV/Draklive/Storage.pm8
2 files changed, 12 insertions, 4 deletions
diff --git a/draklive2 b/draklive2
index ecc4ac1..49f8158 100755
--- a/draklive2
+++ b/draklive2
@@ -684,17 +684,17 @@ sub create_classical_bootloader {
output_p($live->get_system_root . '/boot/grub/menu.lst', build_grub_cfg_raw($live, $live->{media}, -e $initrd && $initrd_prefix, { oem_rescue_idx => $oem_rescue_idx }, $part_idx));
}
-sub get_cdrom_master_path {
+sub get_iso_master_path {
my ($live, $opts) = @_;
$live->get_builddir . $live->{prefix}{build}{dist} . '/' . $live->get_name . ($opts->{boot} && "-boot-$opts->{boot}") . '.iso';
}
-sub create_cdrom_master {
+sub create_iso_master {
my ($live, $opts) = @_;
my $label = $live->{media}->get_media_label or die "the source device must be described by a label\n";
my $dest;
unless ($opts->{onthefly}) {
- $dest = get_cdrom_master_path($live, $opts);
+ $dest = get_iso_master_path($live, $opts);
mkdir_p(dirname($dest));
}
build_iso_image(
@@ -935,7 +935,7 @@ Here's a configuration sample:
no_initrd => 0,
},
media => {
- storage => 'cdrom',
+ storage => 'iso',
},
mount => $predefined{mounts}{squash_union}
};
diff --git a/lib/MDV/Draklive/Storage.pm b/lib/MDV/Draklive/Storage.pm
index 3b16467..0bf1fa9 100644
--- a/lib/MDV/Draklive/Storage.pm
+++ b/lib/MDV/Draklive/Storage.pm
@@ -3,6 +3,14 @@ package MDV::Draklive::Storage;
use detect_devices;
our %storage_types = (
+ iso => {
+ modules => 'bus/firewire|usb disk/firewire|hardware_raid|ide|sata|scsi|usb',
+ fs => 'iso9660',
+ can_hide => 0,
+ source => 'LABEL=MDVISOROOT',
+ read_only => 1,
+ create => \&main::create_iso_master,
+ },
cdrom => {
modules => 'bus/firewire|usb disk/firewire|hardware_raid|ide|sata|scsi|usb',
media_modules => 'disk/cdrom',