From 295625adae17e16fa19f0c60073524566dd788d3 Mon Sep 17 00:00:00 2001 From: Zhang Qiang Date: Tue, 29 Jan 2013 11:06:53 -0500 Subject: [PATCH] Check all mount point to build root, and list them all. Change-Id: Ib9598d03aedd50906f129e1a9aaacc8212979d56 --- depanneur | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/depanneur b/depanneur index c9f27af..e9833fc 100755 --- a/depanneur +++ b/depanneur @@ -1051,17 +1051,19 @@ sub safe_umount { sub mount_source_check { my $build_root = canonpath(shift); + my @mount_list; open my $file, '<', "/proc/self/mountinfo" or die $!; while (<$file>) { chomp; next if ($_ !~ /$build_root/); my @mount_info= split(' ', $_); - if (-e $mount_info[3] and -e "$mount_info[3]/.git"){ - error("$mount_info[3] has been mounted to $mount_info[4]. " . - "Please unmount it manually to avoid being deleted " . - "unexpectly."); - } + push @mount_list, "$mount_info[3] ==> $mount_info[4]"; + } + + if (@mount_list) { + error("there're mounted directories to build root. Please unmount them " . + "manually to avoid being deleted unexpectly:\n\t" . join("\n\t", @mount_list)); } } -- 2.34.1