From: Kristof Roelants <kr.roelants@gmail.com>
Date: Fri, 9 Sep 2016 13:46:48 +0000 (+0200)
Subject: cleanup mountpoints of partitions failing to mount
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d8145d1f78651f0ff4d53b7f2ccc89daeab4561b;p=oweals%2Fmountd.git

cleanup mountpoints of partitions failing to mount

If a partition fails to mount, its autofs mountpoint is created and the mounted
flag is unset. When the partition expires or is removed, the autofs mountpoint
is cleaned up only if the mounted flag is set. Added cleanup of the autofs
mountpoint at removal and unset mounted flag.

Signed-off-by: Kristof Roelants <Kristof.Roelants@technicolor.com>
---

diff --git a/mount.c b/mount.c
index 7cbb8ff..8330abe 100644
--- a/mount.c
+++ b/mount.c
@@ -745,6 +745,8 @@ static void mount_enum_drives(void)
 			p->next->prev = p->prev;
 			p = p->next;
 			log_printf("removing %s\n", q->dev);
+			snprintf(tmp, 64, "%s%s", "/tmp/run/mountd/", q->dev);
+			rmdir(tmp);
 			snprintf(tmp, 64, "%s%s", uci_path, q->name);
 			unlink(tmp);
 			system_printf("ACTION=remove DEVICE=%s NAME=%s /sbin/hotplug-call mount", q->dev, q->name);