From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2B7A2652B2 for ; Sun, 14 Sep 2025 03:57:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822232; cv=none; b=JK1FTzlIIgFhGt/c+XkSaWlHVC8VdnL+kvJyI98PRVswqjBJey9gybRnNCERJkWCGFTLVvVDp7ZqD7W8RyyfkPErUMx/AWCYsCzLwFUI3gl5aXlp8b1RLfP4bE+LMaKHGw2TVm2p3nLMHf65TIId2650nd3VkytdT8IY/KC3iwY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822232; c=relaxed/simple; bh=6pXJgBOVmgKyryw3LURicaeyD0WS1HvzY8WG0GWatOA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bYsftvql4sA5Bv1IdzRCgWAAfiSdb99u+Jkl3dtUDRUU7FVxg6X1LIvz8G/yAItu1FjXLc5wLNcrhwqMt5V1oGCYOsAwV1pq5CRWq2j1DLCXCHGRwMKE5/asG7COMrkG8ctvWO1KqwXzfo1+AVti4A3yrZL2IjKHf9vSdTtp7TI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kRPnFhfi; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kRPnFhfi" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-b046fc9f359so476624066b.0 for ; Sat, 13 Sep 2025 20:57:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757822228; x=1758427028; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y7psSH4JIkuISYR7xy9RNjBVG2GzEUFc3+zgpdmbt9Y=; b=kRPnFhfit7+R6UzkS4cF3DKL1S7JHip+IAyQf6T2UGYDd+vYI9IC8v9G51KVb5WDAk RN/gPz1lGKSMFe9Oe7MIowDwv3N0e4/KFS91xhYm0G+VoSkSei8WkHktPa2wEMB4pNUj WzAE/ebYcnJlcUWXpTXxg7oBxbqGV3WM9sIv1WyWWMlOmd/DBHQ0UO8HJ8wtmu7F5pSQ pAM88kkn9raeM/jhalMJUOdMS5VqW/+AUemoRwnUmW0/oDdl4OSBi4zM++ZdXBaXmYLj VGYSY1r8rSsi6oTo3enO0OXT4w2WPUK9VtsKTo5k8z5kW918njUd5UMO2sKFBB8AaeWA 2SOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757822228; x=1758427028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y7psSH4JIkuISYR7xy9RNjBVG2GzEUFc3+zgpdmbt9Y=; b=lwjZMRJoSQX1nqpVQbylMDnCDOqZwvIjc2jdfLHIzmwEX3kazrW5JDjZ52lRiWPQg9 C7K+eT/A4LtItHx8tRUqKUHP+TYL1V0Avi/xXkkjlSlc3akd1SdxE0+m5ekfmQpK+PD5 rtR92kU4nbBvyO3JqtSJe8WxBh37lj6UXQBKKNCtm/KvGyIDrUZP+93DdZ2r1Y37Nz+e mfNUjU66QNdedFUZumVReVrg6H6CWu26yrmbbxIolgirXQ2hKiwdyJxPPeU8UMbkRMQN rwO/LUJuPaGxxEiD/UMkpMPcNLAJfF+smaBlxCQi8pd0e01iyNG7drCuJRsUQdNgYGPV YOFw== X-Forwarded-Encrypted: i=1; AJvYcCXV7HOHcs/NYC/CgZ9JGbpL2T4wMmn94NwspV0agd9z2/Z/e7HWkdlROULhOUFQxjicu/cjGghlvFiO5Akz@vger.kernel.org X-Gm-Message-State: AOJu0YyV6PxwK5OUBG/SlWydczXGO49GGPVbeamLVzzqBHqMD9gF/Szb GTVztuqbOeqdRGZgAOyHprJg02lg/8qF+4NvSixzqu+QhtOrork5/1lg X-Gm-Gg: ASbGncu/OKydJmcdwauZmwxbLP6BDKKdZXgIgmpurriizLSzcBNCFf3B3go74tY1wJW eawPzq33SUwVs5+ucA7Mx8oE7tr5QES6KtBta8a8JC4WXQkZPJJAfkgot34adjFxA8tHfyPLMXY 4TlDpLa0AIqiRX2zRHSvk+Pr9Ee0YYehyQDjh60rGi2LOVrUKZvsJKT0CwK+mtiALuiBW3JDGGe mRsdbI47P9aKllYHkECWDfO0AAwqmjuCMe3aFSrbIOOf9EpFcl6eWbFg0ODy4NRtdrtCKekUYZ9 ZMQyLAlxPSAripkefQUj6nD3rW9ulfu7E9FCtkdrwnTL/xLSS5qY/fu6SjPtW5EPR6EpESHGHL+ OmCzEzkZ5kkAIFw7aFx0YhsjvtzMGdg== X-Google-Smtp-Source: AGHT+IHHnPU+sOVT053l7deT3P8z3LJVFAOiksWjmZKd0Ub2gBIDgZK1/4gCPHfUrNaBqPQVOEAIKA== X-Received: by 2002:a17:907:d16:b0:b04:6338:c936 with SMTP id a640c23a62f3a-b07c35b8e53mr876582466b.17.1757822228258; Sat, 13 Sep 2025 20:57:08 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32f1e54sm673986866b.75.2025.09.13.20.57.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:57:07 -0700 (PDT) From: Askar Safin To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Torvalds , Greg Kroah-Hartman , Christian Brauner , Al Viro , Jan Kara , Christoph Hellwig , Jens Axboe , Andy Shevchenko , Aleksa Sarai , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Julian Stecklina , Gao Xiang , Art Nikpal , Andrew Morton , Eric Curtin , Alexander Graf , Rob Landley , Lennart Poettering , linux-arch@vger.kernel.org, linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, x86@kernel.org, Ingo Molnar , linux-block@vger.kernel.org, initramfs@vger.kernel.org, linux-api@vger.kernel.org, linux-doc@vger.kernel.org, linux-efi@vger.kernel.org, linux-ext4@vger.kernel.org, "Theodore Y . Ts'o" , linux-acpi@vger.kernel.org, Michal Simek , devicetree@vger.kernel.org, Luis Chamberlain , Kees Cook , Thorsten Blum , Heiko Carstens , patches@lists.linux.dev Subject: [PATCH RESEND 49/62] init: rename ramdisk_execute_command to initramfs_execute_command Date: Sun, 14 Sep 2025 06:57:03 +0300 Message-ID: <20250914035703.3729713-1-safinaskar@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com> References: <20250913003842.41944-1-safinaskar@gmail.com> Precedence: bulk X-Mailing-List: linux-hexagon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This is cleanup after initrd removal Signed-off-by: Askar Safin --- 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