summaryrefslogtreecommitdiff
path: root/init/do_mounts.c
diff options
context:
space:
mode:
authorAdrian Hunter <ext-adrian.hunter@nokia.com>2008-01-31 17:25:00 +0200
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2008-07-14 19:10:52 +0300
commit2d62f488585405bc9108c47cb06957397cfd1059 (patch)
treefc23cb1330c53d4ab4991729f0494280c7bf7548 /init/do_mounts.c
parent4ee6afd34409d296782a5b667d7991b1050e910a (diff)
downloadlinux-3.10-2d62f488585405bc9108c47cb06957397cfd1059.tar.gz
linux-3.10-2d62f488585405bc9108c47cb06957397cfd1059.tar.bz2
linux-3.10-2d62f488585405bc9108c47cb06957397cfd1059.zip
do_mounts: allow UBI root device name
Similarly to MTD devices, allow UBI devices. Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Diffstat (limited to 'init/do_mounts.c')
-rw-r--r--init/do_mounts.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 660c1e50c91..a1de1bf3d6b 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -372,7 +372,8 @@ void __init prepare_namespace(void)
if (saved_root_name[0]) {
root_device_name = saved_root_name;
- if (!strncmp(root_device_name, "mtd", 3)) {
+ if (!strncmp(root_device_name, "mtd", 3) ||
+ !strncmp(root_device_name, "ubi", 3)) {
mount_block_root(root_device_name, root_mountflags);
goto out;
}