#include "libblkid-tiny/libblkid-tiny.h"
+#ifdef UBIFS_EXTROOT
+#include "libubi/libubi.h"
+#endif
+
#define ERROR(fmt, ...) do { \
syslog(LOG_ERR, fmt, ## __VA_ARGS__); \
fprintf(stderr, "block: "fmt, ## __VA_ARGS__); \
vlist_for_each_element(&mounts, m, node) {
if (m->type != TYPE_SWAP)
continue;
- if (uuid && m->uuid && !strcmp(m->uuid, uuid))
+ if (uuid && m->uuid && !strcasecmp(m->uuid, uuid))
return m;
if (label && m->label && !strcmp(m->label, label))
return m;
vlist_for_each_element(&mounts, m, node) {
if (m->type != TYPE_MOUNT)
continue;
- if (m->uuid && uuid && !strcmp(m->uuid, uuid))
+ if (m->uuid && uuid && !strcasecmp(m->uuid, uuid))
return m;
if (m->label && label && !strcmp(m->label, label))
return m;
if (mtd) {
_cache_load("/dev/mtdblock*");
_cache_load("/dev/ubiblock*");
+ _cache_load("/dev/ubi?*_?*");
}
_cache_load("/dev/mmcblk*");
_cache_load("/dev/sd*");
_cache_load("/dev/hd*");
_cache_load("/dev/md*");
+ _cache_load("/dev/vd*");
_cache_load("/dev/mapper/*");
}
if (uuid)
list_for_each_entry(pr, &devices, list)
- if (!strcmp(pr->uuid, uuid))
+ if (!strcasecmp(pr->uuid, uuid))
return pr;
if (label)
return 0;
}
+#ifdef UBIFS_EXTROOT
+static int find_ubi_vol(libubi_t libubi, char *name, int *dev_num, int *vol_id)
+{
+ int dev = 0;
+
+ while (ubi_dev_present(libubi, dev))
+ {
+ struct ubi_dev_info dev_info;
+ struct ubi_vol_info vol_info;
+
+ if (ubi_get_dev_info1(libubi, dev++, &dev_info))
+ continue;
+ if (ubi_get_vol_info1_nm(libubi, dev_info.dev_num, name, &vol_info))
+ continue;
+
+ *dev_num = dev_info.dev_num;
+ *vol_id = vol_info.vol_id;
+
+ return 0;
+ }
+
+ return -1;
+}
+
+static int find_block_ubi(libubi_t libubi, char *name, char *part, int plen)
+{
+ int dev_num;
+ int vol_id;
+ int err = -1;
+
+ err = find_ubi_vol(libubi, name, &dev_num, &vol_id);
+ if (!err)
+ snprintf(part, plen, "/dev/ubi%d_%d", dev_num, vol_id);
+
+ return err;
+}
+
+static int find_block_ubi_RO(libubi_t libubi, char *name, char *part, int plen)
+{
+ int dev_num;
+ int vol_id;
+ int err = -1;
+
+ err = find_ubi_vol(libubi, name, &dev_num, &vol_id);
+ if (!err)
+ snprintf(part, plen, "/dev/ubiblock%d_%d", dev_num, vol_id);
+
+ return err;
+}
+#endif
+
static int check_extroot(char *path)
{
struct blkid_struct_probe *pr = NULL;
char fs[32];
+#ifdef UBIFS_EXTROOT
+ if (find_block_mtd("rootfs", fs, sizeof(fs))) {
+ int err = -1;
+ libubi_t libubi;
+
+ libubi = libubi_open();
+ err = find_block_ubi_RO(libubi, "rootfs", fs, sizeof(fs));
+ libubi_close(libubi);
+ if (err)
+ return -1;
+ }
+#else
if (find_block_mtd("rootfs", fs, sizeof(fs)))
return -1;
+#endif
list_for_each_entry(pr, &devices, list) {
if (!strcmp(pr->dev, fs)) {
fgets(uuid, sizeof(uuid), fp);
fclose(fp);
- if (!strcmp(uuid, pr->uuid))
+ if (!strcasecmp(uuid, pr->uuid))
return 0;
ERROR("extroot: uuid tag does not match rom uuid\n");
}
return -1;
}
+/*
+ * Read info about extroot from UCI (using prefix) and mount it.
+ */
static int mount_extroot(char *cfg)
{
char overlay[] = "/tmp/extroot/overlay";
struct mount *m;
int err = -1;
+ /* Load @cfg/etc/config/fstab */
if (config_load(cfg))
return -2;
+ /* See if there is extroot-specific mount config */
m = find_block(NULL, NULL, NULL, "/");
if (!m)
m = find_block(NULL, NULL, NULL, "/overlay");
return -1;
}
+ /* Find block device pointed by the mount config */
pr = find_block_info(m->uuid, m->label, m->device);
if (!pr && delay_root){
{
struct blkid_struct_probe *pr;
char fs[32] = { 0 };
- char fs_data[32] = { 0 };
+ char blkdev_path[32] = { 0 };
int err = -1;
+#ifdef UBIFS_EXTROOT
+ libubi_t libubi;
+#endif
if (!getenv("PREINIT"))
return -1;
mkblkdev();
cache_load(1);
+ /*
+ * Make sure there is "rootfs" MTD partition or UBI volume.
+ * TODO: What for?
+ */
find_block_mtd("rootfs", fs, sizeof(fs));
if (!fs[0]) {
+#ifdef UBIFS_EXTROOT
+ libubi = libubi_open();
+ find_block_ubi_RO(libubi, "rootfs", fs, sizeof(fs));
+ libubi_close(libubi);
+ if (!fs[0]) {
+ ERROR("extroot: unable to locate rootfs mtdblock / ubiblock\n");
+ return -2;
+ }
+#else
ERROR("extroot: unable to locate rootfs mtdblock\n");
return -2;
+#endif
}
pr = find_block_info(NULL, NULL, fs);
return -3;
}
- find_block_mtd("rootfs_data", fs_data, sizeof(fs_data));
- if (fs_data[0]) {
- pr = find_block_info(NULL, NULL, fs_data);
+ /*
+ * Look for "rootfs_data". We will want to mount it and check for
+ * extroot configuration.
+ */
+
+ /* Start with looking for MTD partition */
+ find_block_mtd("rootfs_data", blkdev_path, sizeof(blkdev_path));
+ if (blkdev_path[0]) {
+ pr = find_block_info(NULL, NULL, blkdev_path);
if (pr && !strcmp(pr->id->name, "jffs2")) {
char cfg[] = "/tmp/jffs_cfg";
+ /*
+ * Mount MTD part and try extroot (using
+ * /etc/config/fstab from that partition)
+ */
mkdir_p(cfg);
- if (!mount(fs_data, cfg, "jffs2", MS_NOATIME, NULL)) {
+ if (!mount(blkdev_path, cfg, "jffs2", MS_NOATIME, NULL)) {
err = mount_extroot(cfg);
umount2(cfg, MNT_DETACH);
}
}
}
+#ifdef UBIFS_EXTROOT
+ /* ... but it also could be an UBI volume */
+ memset(blkdev_path, 0, sizeof(blkdev_path));
+ libubi = libubi_open();
+ find_block_ubi(libubi, "rootfs_data", blkdev_path, sizeof(blkdev_path));
+ libubi_close(libubi);
+ if (blkdev_path[0]) {
+ char cfg[] = "/tmp/ubifs_cfg";
+
+ /* Mount volume and try extroot (using fstab from that vol) */
+ mkdir_p(cfg);
+ if (!mount(blkdev_path, cfg, "ubifs", MS_NOATIME, NULL)) {
+ err = mount_extroot(cfg);
+ umount2(cfg, MNT_DETACH);
+ }
+ if (err < 0)
+ rmdir("/tmp/overlay");
+ rmdir(cfg);
+ return err;
+ }
+#endif
+
return mount_extroot(NULL);
}
projects / project / fstools.git / blobdiff