janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-22 22:20:39 +01:00
Code Activity

integrate-distro.sh: Fix failing umount command

Browse source 
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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-12-26 14:48:39 +00:00
commit 5b6ee5ef6d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/integrate-distro.sh
View file

@ -761,15 +761,15 @@ canonicalize()
check_mount() check_mount()
{ {
local canonicalized=`realpath $root/$1 2>/dev/null` local canonicalized=`realpath --canonicalize-missing $root/$1 2>/dev/null`
#echo root="$root" #echo root="$root"
#echo arg="$1" #echo arg="$1"
#echo canonicalized="$canonicalized" #echo canonicalized="$canonicalized"
[ ! "$canonicalized" ] && return 1 [ ! "$canonicalized" ] && return 1
grep -q " $canonicalized " /proc/mounts && return 0 mount | grep -q " $canonicalized " && return 0
canonicalized=`canonicalize $root/$1` canonicalized=`canonicalize $root/$1`
[ ! "$canonicalized" ] && return 1 [ ! "$canonicalized" ] && return 1
grep -q " $canonicalized " /proc/mounts && return 0 mount | grep -q " $canonicalized " && return 0
return 1 return 1
} }