From d1f1f2b38fa1e7b594bd005e563679a40e4d7e95 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sat, 28 Dec 2019 22:07:21 +0100 Subject: [PATCH] block: remove mount target file if it's a link MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Links like that can remain from using autofs and can cause mounting errors after switching to non-autofs: block: mounting /dev/sda1 (vfat) as /mnt/sda1 failed (2) - No such file or directory Signed-off-by: Rafał Miłecki --- block.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block.c b/block.c index 50d877f..9e530f1 100644 --- a/block.c +++ b/block.c @@ -1072,6 +1072,7 @@ static int mount_device(struct device *dev, int type) { struct mount *m; struct probe_info *pr; + struct stat st; char _target[32]; char *target; char *device; @@ -1154,6 +1155,8 @@ static int mount_device(struct device *dev, int type) check_filesystem(pr); mkdir_p(target); + if (!lstat(target, &st) && S_ISLNK(st.st_mode)) + unlink(target); err = handle_mount(pr->dev, target, pr->type, m); if (err) { -- 2.30.2