[PATCH RESEND 49/62] init: rename ramdisk_execute_command to initramfs_execute_command
From: Askar Safin <hidden>
Date: 2025-09-14 03:57:10
Also in:
linux-acpi, linux-alpha, linux-api, linux-arch, linux-block, linux-devicetree, linux-doc, linux-efi, linux-ext4, linux-fsdevel, linux-m68k, linux-mips, linux-patches, linux-riscv, linux-s390, linux-sh, linux-um, lkml, loongarch, sparclinux
Subsystem:
the rest · Maintainer:
Linus Torvalds
This is cleanup after initrd removal Signed-off-by: Askar Safin <redacted> --- init/main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/init/main.c b/init/main.c
index 5186233c64fd..cbebd64f523c 100644
--- a/init/main.c
+++ b/init/main.c@@ -160,7 +160,7 @@ static size_t initargs_offs; #endif static char *execute_command; -static char *ramdisk_execute_command = "/init"; +static char *initramfs_execute_command = "/init"; /* * Used to generate warnings if static_key manipulation functions are used
@@ -609,7 +609,7 @@ static int __init rdinit_setup(char *str) { unsigned int i; - ramdisk_execute_command = str; + initramfs_execute_command = str; /* See "auto" comment in init_setup */ for (i = 1; i < MAX_INIT_ARGS; i++) argv_init[i] = NULL;
@@ -1491,12 +1491,12 @@ static int __ref kernel_init(void *unused) do_sysctl_args(); - if (ramdisk_execute_command) { - ret = run_init_process(ramdisk_execute_command); + if (initramfs_execute_command) { + ret = run_init_process(initramfs_execute_command); if (!ret) return 0; pr_err("Failed to execute %s (error %d)\n", - ramdisk_execute_command, ret); + initramfs_execute_command, ret); } /*
@@ -1588,11 +1588,11 @@ static noinline void __init kernel_init_freeable(void) * the work */ int ramdisk_command_access; - ramdisk_command_access = init_eaccess(ramdisk_execute_command); + ramdisk_command_access = init_eaccess(initramfs_execute_command); if (ramdisk_command_access != 0) { pr_warn("check access for rdinit=%s failed: %i, ignoring\n", - ramdisk_execute_command, ramdisk_command_access); - ramdisk_execute_command = NULL; + initramfs_execute_command, ramdisk_command_access); + initramfs_execute_command = NULL; prepare_namespace(); }
--
2.47.2