From cd68d1b12b5ea4c01a664c064179ada42bf55d3d Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 15 May 2014 20:55:42 +0200 Subject: [PATCH 5/5] ubi: set ROOT_DEV to ubiblock "rootfs" if unset To: openwrt-devel@lists.openwrt.org Signed-off-by: Daniel Golle --- drivers/mtd/ubi/block.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -50,6 +50,7 @@ #include #include #include +#include #include "ubi-media.h" #include "ubi.h" @@ -447,6 +448,15 @@ int ubiblock_create(struct ubi_volume_in add_disk(dev->gd); dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)", dev->ubi_num, dev->vol_id, vi->name); + + if (!strcmp(vi->name, "rootfs") && + config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) && + ROOT_DEV == 0) { + pr_notice("ubiblock: device ubiblock%d_%d (%s) set to be root filesystem\n", + dev->ubi_num, dev->vol_id, vi->name); + ROOT_DEV = MKDEV(gd->major, gd->first_minor); + } + mutex_unlock(&devices_mutex); return 0;