*
* @STATUS_UNMOUNTED: currently not mounted
* @STATUS_MOUNTED: mounted & ready for usage
+ * @STATUS_EXPIRED: mount expired & *temporary* unmounted
* @STATUS_IGNORE: entry should be ignored and never mounted
*/
enum status {
STATUS_UNMOUNTED = 0,
STATUS_MOUNTED,
+ STATUS_EXPIRED,
STATUS_IGNORE,
};
char tmp[256];
int ret;
snprintf(tmp, 256, "%s%s", path, dev);
- log_printf("%s has expired... unmounting\n", tmp);
+ log_printf("device %s has expired... unmounting %s\n", dev, tmp);
ret = system_printf("/bin/umount %s", tmp);
if(ret != 0)
return 0;
rmdir(tmp);
mount = mount_find(0, dev);
if(mount)
- mount->status = STATUS_UNMOUNTED;
+ mount->status = STATUS_EXPIRED;
log_printf("finished unmounting\n");
mount_dump_uci_state();
return 0;
char tmp[256];
if (mount->status == STATUS_MOUNTED) {
- snprintf(tmp, 256, "%s%s", "/tmp/run/mountd/", mount->name);
- log_printf("%s has dissappeared ... unmounting\n", tmp);
snprintf(tmp, 256, "%s%s", "/tmp/run/mountd/", mount->dev);
+ log_printf("device %s has disappeared ... unmounting %s\n", mount->dev, tmp);
system_printf("/bin/umount %s", tmp);
rmdir(tmp);
- snprintf(tmp, 64, "%s%s", uci_path, mount->name);
- unlink(tmp);
mount_dump_uci_state();
}
}
p->next->prev = p->prev;
p = p->next;
log_printf("removing %s\n", q->dev);
- if (q->status == STATUS_MOUNTED) {
+ if (q->status == STATUS_MOUNTED || q->status == STATUS_EXPIRED) {
snprintf(tmp, 64, "%s%s", "/tmp/run/mountd/", q->dev);
rmdir(tmp);
snprintf(tmp, 64, "%s%s", uci_path, q->name);