return 0;
}
+static bool mtdblock_is_nand(char *mtdnum)
+{
+ char tmppath[64];
+ char buf[16];
+ FILE *fp;
+
+ snprintf(tmppath, sizeof(tmppath) - 1, "/sys/class/mtd/mtd%s/type", mtdnum);
+ fp = fopen(tmppath, "r");
+ if (!fp)
+ return false;
+
+ if (!fgets(buf, sizeof(buf), fp)) {
+ fclose(fp);
+ return false;
+ }
+ fclose(fp);
+ buf[sizeof(buf) - 1] = '\0'; /* make sure buf is 0-terminated */
+ buf[strlen(buf) - 1] = '\0'; /* strip final char (newline) */
+
+ if (strcmp(buf, "nand"))
+ return false;
+
+ /*
+ * --- CUT HERE ---
+ * Keep probing rootfs and rootfs_data in the meantime to not break
+ * devices using JFFS2 on NAND but only trigger the kernel warnings.
+ * Remove this once all devices using JFFS2 and squashfs directly on
+ * NAND have been converted to UBI.
+ */
+ snprintf(tmppath, sizeof(tmppath) - 1, "/sys/class/mtd/mtd%s/name", mtdnum);
+ fp = fopen(tmppath, "r");
+ if (!fp)
+ return false;
+
+ if (!fgets(buf, sizeof(buf), fp)) {
+ fclose(fp);
+ return false;
+ }
+ fclose(fp);
+ buf[sizeof(buf) - 1] = '\0'; /* make sure buf is 0-terminated */
+ buf[strlen(buf) - 1] = '\0'; /* strip final char (newline) */
+
+ /* only return true if name differs from 'rootfs' and 'rootfs_data' */
+ if (strcmp(buf, "rootfs") && strcmp(buf, "rootfs_data"))
+ return true;
+
+ /* --- CUT HERE --- */
+ return false;
+}
+
static struct probe_info* _probe_path(char *path)
{
- struct probe_info *pr;
+ struct probe_info *pr, *epr;
char tmppath[64];
- /* skip ubi device if ubiblock device is present */
+ if (!strncmp(path, "/dev/mtdblock", 13) && mtdblock_is_nand(path + 13))
+ return NULL;
+
+ pr = probe_path(path);
+ if (!pr)
+ return NULL;
+
if (path[5] == 'u' && path[6] == 'b' && path[7] == 'i' &&
path[8] >= '0' && path[8] <= '9' ) {
+ /* skip ubi device if not UBIFS (as it requires ubiblock) */
+ if (strcmp("ubifs", pr->type))
+ return NULL;
+
+ /* skip ubi device if ubiblock device is present */
snprintf(tmppath, sizeof(tmppath), "/dev/ubiblock%s", path + 8);
- list_for_each_entry(pr, &devices, list)
- if (!strcasecmp(pr->dev, tmppath))
+ list_for_each_entry(epr, &devices, list)
+ if (!strcmp(epr->dev, tmppath))
return NULL;
}
- return probe_path(path);
+ return pr;
}
static int _cache_load(const char *path)
_cache_load("/dev/nvme*");
_cache_load("/dev/vd*");
_cache_load("/dev/xvd*");
- _cache_load("/dev/mapper/*");
+ _cache_load("/dev/dm-*");
}
err = exec_mount(source, target, fstype, mount_opts);
}
+ free(mount_opts);
+
return err;
}
{
struct mount *m;
struct stat st;
- char _target[32];
+ char *_target = NULL;
char *target;
char *device;
char *mp;
}
if (m->autofs) {
- snprintf(_target, sizeof(_target), "/tmp/run/blockd/%s", device);
+ if (asprintf(&_target, "/tmp/run/blockd/%s", device) == -1)
+ exit(ENOMEM);
+
target = _target;
} else if (m->target) {
target = m->target;
} else {
- snprintf(_target, sizeof(_target), "/mnt/%s", device);
+ if (asprintf(&_target, "/mnt/%s", device) == -1)
+ exit(ENOMEM);
+
target = _target;
}
} else if (anon_mount) {
- snprintf(_target, sizeof(_target), "/mnt/%s", device);
+ if (asprintf(&_target, "/mnt/%s", device) == -1)
+ exit(ENOMEM);
+
target = _target;
} else {
/* No reason to mount this device */
if (err) {
ULOG_ERR("mounting %s (%s) as %s failed (%d) - %m\n",
pr->dev, pr->type, target, errno);
+
+ if (_target)
+ free(_target);
+
return err;
}
+ if (_target)
+ free(_target);
+
handle_swapfiles(true);
if (type != TYPE_AUTOFS)
static int umount_device(char *path, int type, bool all)
{
- char *mp;
+ char *mp, *devpath;
int err;
- mp = find_mount_point(path);
+ if (strlen(path) > 5 && !strncmp("/dev/", path, 5)) {
+ mp = find_mount_point(path);
+ } else {
+ devpath = malloc(strlen(path) + 6);
+ strcpy(devpath, "/dev/");
+ strcat(devpath, path);
+ mp = find_mount_point(devpath);
+ free(devpath);
+ }
+
if (!mp)
return -1;
- if (!strcmp(mp, "/") && !all)
+ if (!strcmp(mp, "/") && !all) {
+ free(mp);
return 0;
-
+ }
if (type != TYPE_AUTOFS)
blockd_notify("umount", basename(path), NULL, NULL);
static int mount_action(char *action, char *device, int type)
{
- char path[32];
+ char *path = NULL;
+ struct probe_info *pr;
if (!action || !device)
return -1;
- snprintf(path, sizeof(path), "/dev/%s", device);
if (!strcmp(action, "remove")) {
if (type == TYPE_HOTPLUG)
blockd_notify("hotplug", device, NULL, NULL);
- umount_device(path, type, true);
+ umount_device(device, type, true);
return 0;
} else if (strcmp(action, "add")) {
if (config_load(NULL))
return -1;
- cache_load(0);
+
+ cache_load(1);
+
+ list_for_each_entry(pr, &devices, list)
+ if (!strcmp(basename(pr->dev), device))
+ path = pr->dev;
+
+ if (!path)
+ return -1;
return mount_device(find_block_info(NULL, NULL, path), type);
}
if (config_load(NULL))
return -1;
- cache_load(0);
+ cache_load(1);
list_for_each_entry(pr, &devices, list) {
struct mount *m;
char *mp;
handle_swapfiles(false);
- cache_load(0);
+ cache_load(1);
if (argc == 3)
all = !strcmp(argv[2], "-a");