From 831dca2cc91b778f263610c556ce96cc888125a7 Mon Sep 17 00:00:00 2001 From: Slava Barinov Date: Tue, 31 Jul 2018 12:20:03 +0300 Subject: [PATCH] Remove redundant sudo call from unmount procedure sudo is not needed to get mount list. Change-Id: I9e7557f1112752ca339778702650e548c4782e32 Signed-off-by: Slava Barinov --- depanneur | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/depanneur b/depanneur index fb7123a..30aa9e6 100755 --- a/depanneur +++ b/depanneur @@ -2078,11 +2078,13 @@ sub build_package { $srcrpmdirpath = `sudo chroot '$scratch' su -c "rpm --eval %{_srcrpmdir} 2>/dev/null" - abuild`; { # If mounted dirs left inside chroot we have to unmount them - my $escaped_scratch = $scratch =~ s#/#\\/#gr; - my $scratch_mnts = `sudo mount | awk '/$escaped_scratch/{print \$3}'`; - my @scratch_mnt_list = split("\n", $scratch_mnts); - foreach my $scratch_mnt (@scratch_mnt_list) { - safe_umount($scratch_mnt); + open my $file, '<', "/proc/self/mountinfo" or die $!; + while (<$file>) { + chomp; + next if ($_ !~ /$scratch/); + my @mount_info= split(' ', $_); + debug("Unmounting $mount_info[4]"); + safe_umount($mount_info[4]); } } } -- 2.34.1