summaryrefslogtreecommitdiffstats
path: root/draklive2
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-11-26 15:03:48 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-11-26 15:03:48 +0000
commit342062431ecd45a074a58ff8f1a2117241dba44a (patch)
treeb22b4e0da2f9a42dd71357ba468ee03cfa7da132 /draklive2
parentb42500157ca26d602072c0515d0810aadd8bfb12 (diff)
downloaddrakiso-342062431ecd45a074a58ff8f1a2117241dba44a.tar
drakiso-342062431ecd45a074a58ff8f1a2117241dba44a.tar.gz
drakiso-342062431ecd45a074a58ff8f1a2117241dba44a.tar.bz2
drakiso-342062431ecd45a074a58ff8f1a2117241dba44a.tar.xz
drakiso-342062431ecd45a074a58ff8f1a2117241dba44a.zip
draklive2: change storage type from 'cdrom' to 'iso'.
Just for clarity - there's no functional change.
Diffstat (limited to 'draklive2')
-rwxr-xr-xdraklive28
1 files changed, 4 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}
};