diff options
author | Ansuel Smith <ansuelsmth@gmail.com> | 2021-11-05 00:48:27 +0100 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 00:07:34 +0000 |
commit | 483503603cb210919088294051e6d27de1f03718 (patch) | |
tree | dca6df4d449c46344976d6bea10435678ac61b75 /target/linux/generic/pending-5.15/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | |
parent | 1f302afd7350f46ec0fcc4b12b0ad59ac92fe5b6 (diff) | |
download | upstream-483503603cb210919088294051e6d27de1f03718.tar.gz upstream-483503603cb210919088294051e6d27de1f03718.tar.bz2 upstream-483503603cb210919088294051e6d27de1f03718.zip |
generic: 5.15: rework pending patch
Rework pending patch for kernel 5.15
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch')
-rw-r--r-- | target/linux/generic/pending-5.15/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-5.15/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/pending-5.15/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch index e3c4dd2ef4..0efff2b52f 100644 --- a/target/linux/generic/pending-5.15/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch +++ b/target/linux/generic/pending-5.15/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch @@ -48,6 +48,6 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> + if (!mount_ubi_rootfs()) + return; +#endif - #ifdef CONFIG_BLOCK - { - int err = create_dev("/dev/root", ROOT_DEV); + if (ROOT_DEV == 0 && root_device_name && root_fs_names) { + if (mount_nodev_root() == 0) + return; |