mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
5b6bca812d
Refresh pending patches for kernel 6.6. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Weijie Gao <hackpascal@gmail.com>
26 lines
835 B
Diff
26 lines
835 B
Diff
From 5ede3f8aed9a1a579bf7304142600d1f3500add9 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 12 Jun 2023 03:58:42 +0100
|
|
Subject: [PATCH 2/2] init: bypass device lookup for /dev/fit* rootfs
|
|
|
|
Allow 'rootwait' as /dev/fit* can show up late if the underlaying
|
|
device is probed late.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
init/do_mounts.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/init/do_mounts.c
|
|
+++ b/init/do_mounts.c
|
|
@@ -463,7 +463,8 @@ static dev_t __init parse_root_device(char
|
|
int error;
|
|
dev_t dev;
|
|
|
|
- if (!strncmp(root_device_name, "mtd", 3) ||
|
|
+ if (!strncmp(root_device_name, "fit", 3) ||
|
|
+ !strncmp(root_device_name, "mtd", 3) ||
|
|
!strncmp(root_device_name, "ubi", 3))
|
|
return Root_Generic;
|
|
if (strcmp(root_device_name, "/dev/nfs") == 0)
|