From 5b6ee5ef6d638e93aabfc815a46ae7fed98184d5 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 26 Dec 2016 14:48:39 +0000 Subject: [PATCH] integrate-distro.sh: Fix failing umount command umount failed with missing /tmp/agent-host.sock, because it doesn\'t show up as expected in /proc/mounts anymore Signed-off-by: Jan Lindemann --- scripts/integrate-distro.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index 1b60c7b2..6c4a0909 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -761,15 +761,15 @@ canonicalize() check_mount() { - local canonicalized=`realpath $root/$1 2>/dev/null` + local canonicalized=`realpath --canonicalize-missing $root/$1 2>/dev/null` #echo root="$root" #echo arg="$1" #echo canonicalized="$canonicalized" [ ! "$canonicalized" ] && return 1 - grep -q " $canonicalized " /proc/mounts && return 0 + mount | grep -q " $canonicalized " && return 0 canonicalized=`canonicalize $root/$1` [ ! "$canonicalized" ] && return 1 - grep -q " $canonicalized " /proc/mounts && return 0 + mount | grep -q " $canonicalized " && return 0 return 1 }