Unverified Commit 47274528 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6134 v3 rootfs: Fix support for rootfstype= when root= is given 

Merge Pull Request from: @ci-robot 
 
PR sync from: GUO Zihua <guozihua@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KFRM2C3S4UCMOUS7KEX4CYU7PVU6XBZI/ 
 
https://gitee.com/openeuler/kernel/issues/I9FP1N 
 
Link:https://gitee.com/openeuler/kernel/pulls/6134

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents 0c8d7c88 cb39f529

init/do_mounts.c

+8 −3
Original line number Diff line number Diff line
@@ -527,9 +527,14 @@ void __init init_rootfs(void) 
#ifdef CONFIG_IMA_DIGEST_LIST

	if (IS_ENABLED(CONFIG_TMPFS) &&

		(!saved_root_name[0] || initramtmpfs) &&

#else

	if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&

#endif

		(!root_fs_names || strstr(root_fs_names, "tmpfs")))

		is_tmpfs = true;

#else

	if (IS_ENABLED(CONFIG_TMPFS)) {

		if (!saved_root_name[0] && !root_fs_names)

			is_tmpfs = true;

		else if (root_fs_names && !!strstr(root_fs_names, "tmpfs"))

			is_tmpfs = true;

	}

#endif

}