summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-11-17 15:17:34 +0000
committerOlivier Blin <oblin@mandriva.com>2008-11-17 15:17:34 +0000
commitca0f1022f81d93954d9a042a09b2ad5a97110a1f (patch)
tree5dbc77754d7f46a0545ab27e246c7bd54d25bc8c
parent0d6b1a52d2b915aafadaef302d801a7cdd75b7d9 (diff)
downloaddraklive-ca0f1022f81d93954d9a042a09b2ad5a97110a1f.tar
draklive-ca0f1022f81d93954d9a042a09b2ad5a97110a1f.tar.gz
draklive-ca0f1022f81d93954d9a042a09b2ad5a97110a1f.tar.bz2
draklive-ca0f1022f81d93954d9a042a09b2ad5a97110a1f.tar.xz
draklive-ca0f1022f81d93954d9a042a09b2ad5a97110a1f.zip
add extension when listing selected loopbacks
-rwxr-xr-xdraklive5
1 files changed, 3 insertions, 2 deletions
diff --git a/draklive b/draklive
index e72e638..f76e671 100755
--- a/draklive
+++ b/draklive
@@ -424,9 +424,10 @@ sub create_loopback_files {
sub list_selected_loopbacks {
my ($live) = @_;
+ my @pack = $live->{settings}{pack} ? @{$live->{packs}{$live->{settings}{pack}} || []} : ();
+ my @pack_modules = grep { member($_->{name}, @pack) } list_loopback_modules($live);
(map { $loop_types{$_->{type}}{is_loopback} && $_->{path} ? $_->{path} . $loop_types{$_->{type}}{extension} : () } @{$live->{mount}{dirs} || []}),
- (map { $live->{prefix}{build}{modules} . '/' . $_ }
- $live->{settings}{pack} ? @{$live->{packs}{$live->{settings}{pack}} || []} : ());
+ (map { $live->{prefix}{build}{modules} . '/' . $_->{name} . $loop_types{$_->{type}}{extension} } @pack_modules);
}
sub get_media_device {