diff options
| -rwxr-xr-x | draklive | 4 | ||||
| -rwxr-xr-x | lib/MGA/DrakISO/BuildLoop.pm | 2 | ||||
| -rwxr-xr-x | lib/MGA/DrakISO/BuildRoot.pm | 2 | ||||
| -rw-r--r-- | lib/MGA/DrakISO/Utils.pm | 4 |
4 files changed, 6 insertions, 6 deletions
@@ -50,8 +50,8 @@ $::verbose = 1; sub clean { my ($build) = @_; - # make sure no external filesystems are mounted before cleaning - umount_external_fs($build); + # Make sure no filesystems are mounted in the chroot before cleaning. + umount_all_in_chroot($build); rm_rf($_) foreach grep { -e $_ } $build->get_builddir, $build->get_system_root; } diff --git a/lib/MGA/DrakISO/BuildLoop.pm b/lib/MGA/DrakISO/BuildLoop.pm index 9e98bd1..66d51a7 100755 --- a/lib/MGA/DrakISO/BuildLoop.pm +++ b/lib/MGA/DrakISO/BuildLoop.pm @@ -37,7 +37,7 @@ our @EXPORT = qw(build_live_loopback_files list_loopback_modules); sub build_live_loopback_files { my ($build) = @_; # make sure no external filesystems are mounted before creating the loopback - umount_external_fs($build); + umount_all_in_chroot($build); my @excluded_files = expand_file_list($build, @{$build->{loopbacks}{exclude}{files} || []}); my @modules_files = expand_file_list($build, @{$build->{loopbacks}{modules} || []}); diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm index 501d1dd..9f789a0 100755 --- a/lib/MGA/DrakISO/BuildRoot.pm +++ b/lib/MGA/DrakISO/BuildRoot.pm @@ -175,7 +175,7 @@ sub customise_live_system { clean_system_conf_file($build, "/etc/resolv.conf"); write_dist_lists($build); - umount_external_fs($build); + umount_all_in_chroot($build); umask $previous_umask; } diff --git a/lib/MGA/DrakISO/Utils.pm b/lib/MGA/DrakISO/Utils.pm index b7dbcee..35fae93 100644 --- a/lib/MGA/DrakISO/Utils.pm +++ b/lib/MGA/DrakISO/Utils.pm @@ -30,7 +30,7 @@ use IO::Select; use Exporter; our @ISA = qw(Exporter); -our @EXPORT = qw(directory_usage run_ copy_or_link mount_system_fs umount_external_fs); +our @EXPORT = qw(directory_usage run_ copy_or_link mount_system_fs umount_all_in_chroot); sub directory_usage { my ($dir, $o_apparent) = @_; @@ -96,7 +96,7 @@ sub mount_system_fs { run_('mount', '-t', 'sysfs', '/sys', $build->get_system_root . '/sys'); } -sub umount_external_fs { +sub umount_all_in_chroot { my ($build) = @_; my $system_root = Cwd::abs_path($build->get_system_root); my @mounts = grep { $_ =~ $system_root } split("\n", cat_('/proc/mounts')); |