static void
device_free(struct device *device)
{
- struct blob_attr *data[__MOUNT_MAX];
- char *target = NULL;
- char *path = NULL, _path[64], *mp;
-
- blobmsg_parse(mount_policy, __MOUNT_MAX, data,
- blob_data(device->msg), blob_len(device->msg));
+ char *mp;
- if (data[MOUNT_AUTOFS]) {
- target = device->target;
- snprintf(_path, sizeof(_path), "/tmp/run/blockd/%s",
- blobmsg_get_string(data[MOUNT_DEVICE]));
- path = _path;
- } else {
- path = target = device->target;
- }
+ if (!device->autofs)
+ return;
- mp = _find_mount_point(device->name);
- if (path && mp)
- if (umount2(path, MNT_DETACH))
- ULOG_ERR("failed to unmount %s\n", path);
- free(mp);
+ block("autofs", "unavailable", device->name);
- if (!target)
- return;
+ if (device->target)
+ unlink(device->target);
- if (data[MOUNT_AUTOFS])
- unlink(target);
- else
- rmdir(target);
+ mp = _find_mount_point(device->name);
+ if (mp) {
+ block("autofs", "remove", device->name);
+ free(mp);
+ }
}
static void
device_add(struct device *device)
{
- struct blob_attr *data[__MOUNT_MAX];
+ struct stat st;
char path[64];
- blobmsg_parse(mount_policy, __MOUNT_MAX, data,
- blob_data(device->msg), blob_len(device->msg));
-
- if (!data[MOUNT_AUTOFS])
+ if (!device->autofs)
return;
- snprintf(path, sizeof(path), "/tmp/run/blockd/%s",
- blobmsg_get_string(data[MOUNT_DEVICE]));
+ 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\n", device->target, path);
+ ULOG_ERR("failed to symlink %s->%s (%d) - %m\n", device->target, path, errno);
+ else
+ block("autofs", "available", device->name);
}
static int
unlink(device_o->target);
snprintf(path, sizeof(path), "/tmp/run/blockd/%s", device_n->name);
if (symlink(path, device_n->target))
- ULOG_ERR("failed to symlink %s->%s\n", device_n->target, path);
+ ULOG_ERR("failed to symlink %s->%s (%d) - %m\n", device_n->target, path, errno);
} else {
mkdir(device_n->target, 0755);
if (mount(device_o->target, device_n->target, NULL, MS_MOVE, NULL))
if (!device)
return UBUS_STATUS_UNKNOWN_ERROR;
- vlist_update(&devices);
if (data[MOUNT_REMOVE]) {
vlist_delete(&devices, &device->node);
} else {
strcpy(_name, devname);
device->target = __target;
strcpy(__target, target);
- vlist_add(&devices, &device->node, blobmsg_get_string(data[MOUNT_DEVICE]));
+ vlist_add(&devices, &device->node, device->name);
}
- vlist_flush(&devices);
return 0;
}
if (mp) {
blobmsg_add_string(&bb, "mount", mp);
free(mp);
+ } else if (device->autofs && device->target) {
+ blobmsg_add_string(&bb, "mount", device->target);
}
blobmsg_close_table(&bb, t);
}