diff options
author | Olivier Blin <oblin@mandriva.com> | 2007-05-16 20:12:57 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2007-05-16 20:12:57 +0000 |
commit | 08a0fe399e4d6e387f3ab516286956b3dbeeb9c5 (patch) | |
tree | 2987f8ecded111e66167262001a11e53246ccfa8 | |
parent | 657ac2e0df08d1b4d28edcc5543030fef0145d85 (diff) | |
download | draklive-08a0fe399e4d6e387f3ab516286956b3dbeeb9c5.tar draklive-08a0fe399e4d6e387f3ab516286956b3dbeeb9c5.tar.gz draklive-08a0fe399e4d6e387f3ab516286956b3dbeeb9c5.tar.bz2 draklive-08a0fe399e4d6e387f3ab516286956b3dbeeb9c5.tar.xz draklive-08a0fe399e4d6e387f3ab516286956b3dbeeb9c5.zip |
transform list_excluded_files as more generic expand_file_list
-rwxr-xr-x | draklive | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -743,13 +743,13 @@ sub umount_external_filesystem { eval { fs::mount::umount("$mnt/$_") } foreach all($mnt); } -sub list_excluded_files { - my ($live) = @_; +sub expand_file_list { + my ($live, @files) = @_; map { $_->{path} ? $_->{path} : chomp_(cat_(($_->{rooted} && get_system_root($live)) . $_->{source})); - } @{$live->{system}{exclude_files}}; + } @files; } sub create_loopback_files { @@ -757,7 +757,7 @@ sub create_loopback_files { # umount filesystem in the live before creating the loopback umount_external_filesystem($live); - my @excluded_files = list_excluded_files($live); + my @excluded_files = expand_file_list($live, @{$live->{loopbacks}{exclude_files}}); foreach (grep { exists $loop{$_->{type}}{build} } @{$live->{mount}{dirs} || []}) { local $_->{exclude} = [ @excluded_files ]; |