mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
3a187fa718
Also add a new kconfig symbol (CONFIG_KCMP) to the generic config, disabling the SYS_kcmp syscall (it was split from CONFIG_CHECKPOINT_RESTORE, which is disabled by default, so the previous behaviour is kept). Removed (upstreamed) patches: 070-net-icmp-pass-zeroed-opts-from-icmp-v6-_ndo_send-bef.patch 081-wireguard-device-do-not-generate-ICMP-for-non-IP-pac.patch 082-wireguard-queueing-get-rid-of-per-peer-ring-buffers.patch 083-wireguard-kconfig-use-arm-chacha-even-with-no-neon.patch 830-v5.12-0002-usb-serial-option-update-interface-mapping-for-ZTE-P685M.patch Manually rebased patches: 313-helios4-dts-status-led-alias.patch 104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch Run tested: ath79 (TL-WDR3600) mvebu (Turris Omnia) Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
72 lines
1.9 KiB
Diff
72 lines
1.9 KiB
Diff
From: Imre Kaloz <kaloz@openwrt.org>
|
|
Subject: init: add CONFIG_MANGLE_BOOTARGS and disable it by default
|
|
|
|
Enabling this option renames the bootloader supplied root=
|
|
and rootfstype= variables, which might have to be know but
|
|
would break the automatisms OpenWrt uses.
|
|
|
|
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|
---
|
|
init/Kconfig | 9 +++++++++
|
|
init/main.c | 24 ++++++++++++++++++++++++
|
|
2 files changed, 33 insertions(+)
|
|
|
|
--- a/init/Kconfig
|
|
+++ b/init/Kconfig
|
|
@@ -1791,6 +1791,15 @@ config EMBEDDED
|
|
an embedded system so certain expert options are available
|
|
for configuration.
|
|
|
|
+config MANGLE_BOOTARGS
|
|
+ bool "Rename offending bootargs"
|
|
+ depends on EXPERT
|
|
+ help
|
|
+ Sometimes the bootloader passed bogus root= and rootfstype=
|
|
+ parameters to the kernel, and while you want to ignore them,
|
|
+ you need to know the values f.e. to support dual firmware
|
|
+ layouts on the flash.
|
|
+
|
|
config HAVE_PERF_EVENTS
|
|
bool
|
|
help
|
|
--- a/init/main.c
|
|
+++ b/init/main.c
|
|
@@ -607,6 +607,29 @@ static inline void setup_nr_cpu_ids(void
|
|
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
|
|
#endif
|
|
|
|
+#ifdef CONFIG_MANGLE_BOOTARGS
|
|
+static void __init mangle_bootargs(char *command_line)
|
|
+{
|
|
+ char *rootdev;
|
|
+ char *rootfs;
|
|
+
|
|
+ rootdev = strstr(command_line, "root=/dev/mtdblock");
|
|
+
|
|
+ if (rootdev)
|
|
+ strncpy(rootdev, "mangled_rootblock=", 18);
|
|
+
|
|
+ rootfs = strstr(command_line, "rootfstype");
|
|
+
|
|
+ if (rootfs)
|
|
+ strncpy(rootfs, "mangled_fs", 10);
|
|
+
|
|
+}
|
|
+#else
|
|
+static void __init mangle_bootargs(char *command_line)
|
|
+{
|
|
+}
|
|
+#endif
|
|
+
|
|
/*
|
|
* We need to store the untouched command line for future reference.
|
|
* We also need to store the touched command line since the parameter
|
|
@@ -868,6 +891,7 @@ asmlinkage __visible void __init __no_sa
|
|
pr_notice("%s", linux_banner);
|
|
early_security_init();
|
|
setup_arch(&command_line);
|
|
+ mangle_bootargs(command_line);
|
|
setup_boot_config(command_line);
|
|
setup_command_line(command_line);
|
|
setup_nr_cpu_ids();
|