summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-10-28 20:51:07 +0000
committerOlivier Blin <oblin@mandriva.com>2008-10-28 20:51:07 +0000
commitd056dbb5e6d9fac1ae32e43642f24be0c57c4007 (patch)
treef7185829675594ec94864f20dd895e983416be5a
parent8882c347c5d80b11be3d8c6683a8279375261dce (diff)
downloaddraklive-d056dbb5e6d9fac1ae32e43642f24be0c57c4007.tar
draklive-d056dbb5e6d9fac1ae32e43642f24be0c57c4007.tar.gz
draklive-d056dbb5e6d9fac1ae32e43642f24be0c57c4007.tar.bz2
draklive-d056dbb5e6d9fac1ae32e43642f24be0c57c4007.tar.xz
draklive-d056dbb5e6d9fac1ae32e43642f24be0c57c4007.zip
move get_media_fs_module as method in MDV::Draklive::Media
-rwxr-xr-xdraklive8
-rw-r--r--lib/MDV/Draklive/Media.pm6
2 files changed, 7 insertions, 7 deletions
diff --git a/draklive b/draklive
index 0dcea7d..3a1f1b9 100755
--- a/draklive
+++ b/draklive
@@ -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;