From: Rafał Miłecki <rafal@milecki.pl>
Date: Sat, 28 Dec 2019 21:07:22 +0000 (+0100)
Subject: blockd: remove symlink linkpath file if it's a dir or link
X-Git-Url: http://git.openwrt.org/?p=project%2Ffstools.git;a=commitdiff_plain;h=830441d790d67147dc9d9bca4a9d3d4a7228e367

blockd: remove symlink linkpath file if it's a dir or link

Files like that can remain from using non-autofs mounting and can cause
mounting errors after switching to autofs:
blockd: failed to symlink /mnt/sda1->/tmp/run/blockd/sda1

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/blockd.c b/blockd.c
index 84bea6e..6e53a13 100644
--- a/blockd.c
+++ b/blockd.c
@@ -131,12 +131,19 @@ device_free(struct device *device)
 static void
 device_add(struct device *device)
 {
+	struct stat st;
 	char path[64];
 
 	if (!device->autofs)
 		return;
 
 	snprintf(path, sizeof(path), "/tmp/run/blockd/%s", device->name);
+	if (!lstat(device->target, &st)) {
+		if (S_ISLNK(st.st_mode))
+			unlink(device->target);
+		else if (S_ISDIR(st.st_mode))
+			rmdir(device->target);
+	}
 	if (symlink(path, device->target))
 		ULOG_ERR("failed to symlink %s->%s (%d) - %m\n", device->target, path, errno);
 	else