Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-18 00:58:31 +00:00
Code Issues Projects Releases Wiki Activity

systemd-autofs-restart.sh: explicitly return result from get_fs_type

Browse source 
This helper uses other binaries (like awk), which can fail or be killed.
It this case might be, that no mountpoint is found.
Or, on other hand, the whole mount point path is wrong, and is absend in
mountinfo.
Return explicit error in this case.
Without this patch, script will proceed further, and, since returned value is
empty, it doesn't equal to "autofs", so script will try to bind-mount autofs
mount, resulting in hung.

 travis-ci: success for systemd-autofs-restart.sh: explicitly return result from get_fs_type
Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Stanislav Kinsburskiy 2016-10-06 16:21:00 +03:00 • committed by Pavel Emelyanov
parent 4e3d0f7d68
commit dd3a901210
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/systemd-autofs-restart.sh
View file

@ -73,7 +73,13 @@ function get_fs_type {
top_mount_fs_type=$mnt_fs_type
done < "/proc/$CRTOOLS_INIT_PID/mountinfo"
if [ -z "$top_mount_fs_type" ]; then
echo "Failed to find $mountpoint mountpoint"
return 1
fi
echo $top_mount_fs_type
return 0
}
function bind_mount {
@ -92,7 +98,7 @@ function save_mountpoint {
top_mount_fs_type=$(get_fs_type $mountpoint)
if [ $? -ne 0 ]; then
echo "Failed to discover $mountpoint mount point type"
echo "$top_mount_fs_type"
return
fi