return err;
}
-static int hotplug_call_mount(const char *action, const char *device)
-{
- pid_t pid;
- int err = 0;
-
- pid = fork();
- if (!pid) {
- char * const argv[] = { "hotplug-call", "mount", NULL };
-
- setenv("ACTION", action, 1);
- setenv("DEVICE", device, 1);
-
- execv("/sbin/hotplug-call", argv);
- exit(-1);
- } else if (pid > 0) {
- int status;
-
- pid = waitpid(pid, &status, 0);
- if (pid <= 0 || !WIFEXITED(status) || WEXITSTATUS(status)) {
- err = -ENOEXEC;
- ULOG_ERR("hotplug-call call failed\n");
- }
- } else {
- err = -errno;
- }
-
- return err;
-}
-
static int handle_mount(const char *source, const char *target,
const char *fstype, struct mount *m)
{
return err;
}
-static int blockd_notify(char *device, struct mount *m, struct probe_info *pr)
+static int blockd_notify(const char *method, char *device, struct mount *m,
+ struct probe_info *pr)
{
struct ubus_context *ctx = ubus_connect(NULL);
uint32_t id;
blobmsg_add_u32(&buf, "remove", 1);
}
- err = ubus_invoke(ctx, id, "hotplug", buf.head, NULL, NULL, 3000);
+ err = ubus_invoke(ctx, id, method, buf.head, NULL, NULL, 3000);
} else {
err = -ENOENT;
}
}
if (type == TYPE_HOTPLUG)
- blockd_notify(device, m, pr);
+ blockd_notify("hotplug", device, m, pr);
/* Check if device should be mounted & set the target directory */
if (m) {
handle_swapfiles(true);
if (type != TYPE_AUTOFS)
- hotplug_call_mount("add", device);
+ blockd_notify("mount", device, NULL, NULL);
return 0;
}
return 0;
if (type != TYPE_AUTOFS)
- hotplug_call_mount("remove", basename(path));
+ blockd_notify("umount", basename(path), NULL, NULL);
err = umount2(mp, MNT_DETACH);
if (err) {
if (!strcmp(action, "remove")) {
if (type == TYPE_HOTPLUG)
- blockd_notify(device, NULL, NULL);
+ blockd_notify("hotplug", device, NULL, NULL);
umount_device(path, type, true);
cache_load(0);
list_for_each_entry(pr, &devices, list) {
struct mount *m;
+ char *mp;
if (!strcmp(pr->type, "swap"))
continue;
if (m && m->extroot)
continue;
- blockd_notify(pr->dev, m, pr);
+ blockd_notify("hotplug", pr->dev, m, pr);
+ if ((!m || !m->autofs) && (mp = find_mount_point(pr->dev))) {
+ blockd_notify("mount", pr->dev, NULL, NULL);
+ free(mp);
+ }
}
- } else if (!strcmp(argv[2], "available")) {
- err = hotplug_call_mount("add", argv[3]);
- } else if (!strcmp(argv[2], "unavailable")) {
- err = hotplug_call_mount("remove", argv[3]);
} else {
if (argc < 4)
return -EINVAL;
return err;
}
-
-#else
+#endif
static int find_root_dev(char *buf, int len)
{
return -1;
}
-#endif
-
static int test_fs_support(const char *name)
{
char line[128], *p;
return rv;
}
+/**
+ * Check if mounted partition is a valid extroot
+ *
+ * @path target mount point
+ *
+ * Valid extroot partition has to contain /etc/.extroot-uuid with UUID of root
+ * device. This function reads UUID and verifies it OR writes UUID to
+ * .extroot-uuid if it doesn't exist yet (first extroot usage).
+ */
static int check_extroot(char *path)
{
struct probe_info *pr = NULL;
+ struct probe_info *tmp;
+ struct stat s;
+ char uuid[64] = { 0 };
char devpath[32];
+ char tag[64];
+ FILE *fp;
+ int err;
+ err = find_block_mtd("\"rootfs\"", devpath, sizeof(devpath));
#ifdef UBIFS_EXTROOT
- if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
- int err = -1;
+ if (err) {
libubi_t libubi;
libubi = libubi_open();
err = find_block_ubi_RO(libubi, "rootfs", devpath, sizeof(devpath));
libubi_close(libubi);
- if (err)
- return -1;
}
-#else
- if (find_block_mtd("\"rootfs\"", devpath, sizeof(devpath))) {
- if (find_root_dev(devpath, sizeof(devpath))) {
- ULOG_ERR("extroot: unable to determine root device\n");
- return -1;
+#endif
+ if (err) {
+ err = find_root_dev(devpath, sizeof(devpath));
+ }
+ if (err) {
+ ULOG_ERR("extroot: unable to determine root device\n");
+ return -1;
+ }
+
+ /* Find root device probe_info so we know its UUID */
+ list_for_each_entry(tmp, &devices, list) {
+ if (!strcmp(tmp->dev, devpath)) {
+ pr = tmp;
+ break;
}
}
-#endif
+ if (!pr) {
+ ULOG_ERR("extroot: unable to lookup root device %s\n", devpath);
+ return -1;
+ }
- list_for_each_entry(pr, &devices, list) {
- if (!strcmp(pr->dev, devpath)) {
- struct stat s;
- FILE *fp = NULL;
- char tag[64];
- char uuid[64] = { 0 };
-
- snprintf(tag, sizeof(tag), "%s/etc", path);
- if (stat(tag, &s))
- mkdir_p(tag);
-
- snprintf(tag, sizeof(tag), "%s/etc/.extroot-uuid", path);
- if (stat(tag, &s)) {
- fp = fopen(tag, "w+");
- if (!fp) {
- ULOG_ERR("extroot: failed to write UUID to %s: %d (%m)\n",
- tag, errno);
- /* return 0 to continue boot regardless of error */
- return 0;
- }
- fputs(pr->uuid, fp);
- fclose(fp);
- return 0;
- }
+ snprintf(tag, sizeof(tag), "%s/etc", path);
+ if (stat(tag, &s))
+ mkdir_p(tag);
- fp = fopen(tag, "r");
- if (!fp) {
- ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n",
- tag, errno);
- return -1;
- }
+ snprintf(tag, sizeof(tag), "%s/etc/.extroot-uuid", path);
+ if (stat(tag, &s)) {
+ fp = fopen(tag, "w+");
+ if (!fp) {
+ ULOG_ERR("extroot: failed to write UUID to %s: %d (%m)\n",
+ tag, errno);
+ /* return 0 to continue boot regardless of error */
+ return 0;
+ }
+ fputs(pr->uuid, fp);
+ fclose(fp);
+ return 0;
+ }
- if (!fgets(uuid, sizeof(uuid), fp))
- ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n",
- tag, errno);
- fclose(fp);
+ fp = fopen(tag, "r");
+ if (!fp) {
+ ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n", tag,
+ errno);
+ return -1;
+ }
- if (*uuid && !strcasecmp(uuid, pr->uuid))
- return 0;
+ if (!fgets(uuid, sizeof(uuid), fp))
+ ULOG_ERR("extroot: failed to read UUID from %s: %d (%m)\n", tag,
+ errno);
+ fclose(fp);
- ULOG_ERR("extroot: UUID mismatch (root: %s, %s: %s)\n",
- pr->uuid, basename(path), uuid);
- return -1;
- }
- }
+ if (*uuid && !strcasecmp(uuid, pr->uuid))
+ return 0;
- ULOG_ERR("extroot: unable to lookup root device %s\n", devpath);
+ ULOG_ERR("extroot: UUID mismatch (root: %s, %s: %s)\n", pr->uuid,
+ basename(path), uuid);
return -1;
}
return err;
}
+/**
+ * Look for extroot config and mount it if present
+ *
+ * Look for /etc/config/fstab on all supported partitions and use it for
+ * mounting extroot if specified.
+ */
static int main_extroot(int argc, char **argv)
{
struct probe_info *pr;
}
#endif
+ /* As a last resort look for /etc/config/fstab on "rootfs" partition */
return mount_extroot(NULL);
}
projects / project / fstools.git / blobdiff