diff options
| -rwxr-xr-x | draklive | 8 | ||||
| -rw-r--r-- | lib/MDV/Draklive/Media.pm | 6 |
2 files changed, 7 insertions, 7 deletions
@@ -484,7 +484,7 @@ sub create_initrd_for_media { my ($extra_modules, $extra_missing) = partition { list_modules::modname2filename($_) } category2modules($media->get_media_setting('media_modules')), nls_modules($live), - get_media_fs_module($media), + $media->get_media_fs_module, @{$media->get_media_setting('extra_modules') || []}, (map { @{$loop{$_}{modules} || []} } uniq(map { $_->{type} } @{$live->{mount}{dirs} || []})), ($live->{mount}{overlay} ? @{$overlay{$live->{mount}{overlay}}{modules} || []} : ()); @@ -1022,12 +1022,6 @@ sub list_selected_loopbacks { $live->{settings}{pack} ? @{$live->{packs}{$live->{settings}{pack}} || []} : ()); } -sub get_media_fs_module { - my ($media) = @_; - my $fs = $media->get_media_setting('fs'); - $fs eq 'iso9660' ? 'isofs' : $fs eq 'ext2' ? @{[]} : $fs; -} - sub get_media_label { my ($media) = @_; first($media->get_media_setting('source') =~ /^LABEL=(.*)$/); diff --git a/lib/MDV/Draklive/Media.pm b/lib/MDV/Draklive/Media.pm index baf1d21..a6242c1 100644 --- a/lib/MDV/Draklive/Media.pm +++ b/lib/MDV/Draklive/Media.pm @@ -23,4 +23,10 @@ sub get_media_setting { $media->{$setting} || $media->get_storage_setting($setting); } +sub get_media_fs_module { + my ($media) = @_; + my $fs = $media->get_media_setting('fs'); + $fs eq 'iso9660' ? 'isofs' : $fs eq 'ext2' ? @{[]} : $fs; +} + 1; |