summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-08-28 08:35:27 +0000
committerOlivier Blin <oblin@mandriva.com>2007-08-28 08:35:27 +0000
commit9bdda839b5d414cf7faa47c821850e0760ab9ace (patch)
tree1a8386357bf9c1be939bfb3dc855e37e494c707e
parent60503c679e32866c11d087b795258544b822b9dc (diff)
downloaddraklive-9bdda839b5d414cf7faa47c821850e0760ab9ace.tar
draklive-9bdda839b5d414cf7faa47c821850e0760ab9ace.tar.gz
draklive-9bdda839b5d414cf7faa47c821850e0760ab9ace.tar.bz2
draklive-9bdda839b5d414cf7faa47c821850e0760ab9ace.tar.xz
draklive-9bdda839b5d414cf7faa47c821850e0760ab9ace.zip
add a new is_loopback variable to better list selected loopbacks
-rwxr-xr-xdraklive4
1 files changed, 3 insertions, 1 deletions
diff --git a/draklive b/draklive
index 99515be..1cda190 100755
--- a/draklive
+++ b/draklive
@@ -178,6 +178,7 @@ my $loop_number = 0;
my %loop = (
squashfs => {
read_only => 1,
+ is_loopback => 1,
modules => [ qw(loop squashfs) ],
extension => '.sqfs',
build => sub {
@@ -223,6 +224,7 @@ my %loop = (
},
},
loopfs => {
+ is_loopback => 1,
modules => [],
extension => '.loop',
build => sub {
@@ -867,7 +869,7 @@ sub create_loopback_files {
sub list_selected_loopbacks {
my ($live) = @_;
- (map { $_->{type} ne "modules" && $_->{path} ? $_->{path} : () } @{$live->{mount}{dirs} || []}),
+ (map { $loop{$_->{type}}{is_loopback} && $_->{path} ? $_->{path} : () } @{$live->{mount}{dirs} || []}),
(map { $live->{prefix}{build}{modules} . '/' . $_ }
$live->{settings}{pack} ? @{$live->{packs}{$live->{settings}{pack}} || []} : ());
}