From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 E01CE1D5146 for ; Sun, 14 Sep 2025 03:57:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822233; cv=none; b=NLMfvavY6kRUwXKFL5GnPuAhDUb1b6XzFyvgRIMANgnudrzfrFt68d6x0t1tmXEYtV01wZ41xxucGZr8xOU/F/lVjgoIrXDUVYv/KP/JRoWisENeahgFjmTZ3JQH7EXu5d8T4IPFWROMlhmd1rbbo0nkIRBOjMLxAL+By9mOP1I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822233; c=relaxed/simple; bh=6pXJgBOVmgKyryw3LURicaeyD0WS1HvzY8WG0GWatOA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XE+nDsnkON6jMLHfyQjn/rpBERVhRWW+tih9ujiOvUBuoG0CTKSz+i8x4cFZdNaXPsGUJJ8XzQ0HtxJUY2F9w2+Okn+/TyRq3R35T/sKrcHC+XmxATzCCK5h+4cjSFtBtIs2Kp5nWUAjWL2nK1Hifw6RWg1zROqxkGQ5MgYbQLM= 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=DzzOuzaP; arc=none smtp.client-ip=209.85.218.53 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="DzzOuzaP" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-b07e081d852so184009966b.2 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=lists.linux-m68k.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=DzzOuzaP8wZKd4NgcBJ4bVIBGWboEtGDxOhXiKmysTdVsizLW10F9PR8QaAK1usC4i tr99dfz9rqa7ZKYocdQRToRNQ0BOhjvccxE4kARQ22lhhrpK8EUjvE2aDuBVgWyrnBsf KpvAisVIyHcIlrS43SkXPD4mlMeCg9UHFfKQQnoSq6e+iPEMXNFoq4ZeRVtOBbzFG0w9 jLwl/xOFBZxyJHOzcmHyQZXpIHnJ5gf2c2QvPkcyoqZBi57TRGsOnKn6idgVBgbMMNVg 0xlbYKk5q8Mp38m9Hrsrc4Bz8tNxO0Z4wufi0Uwn8cPL9mpo6A8N85aBYUWgbfk7GNEj RTxw== 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=O053dtsOwZhs9q2GM2Yv3DKU+7iTwsqpni8GkFJYLlEw9rHy8mMvgnAoaepXQr0O1u LUQP2oVO/VEV3pMIN2izVOHskNOh94W6+eLYY4sU/HoZ1LFjV8r82sxRDRppCIIHS6BN mG5k2B0IwBV+tjinAsBm29WlrFvZdiVEoMkLqugkBuZ6t1/zUnnNFS1aPMA+jI/AIWnv akAuFFqmMNt2gUu/lwwRf6Zk+821jFUbg/aQYD9IpAStasGrJEt5Y9oD/pC7MLgDvMlw 0EhtgxfDV9LgJFwCnoFsQdnN4Z39T7AIbTD5KPJsUDjGMvKSoIE6XkEOcCLBzlUS4zHq Jgxw== X-Forwarded-Encrypted: i=1; AJvYcCWKBichTx1TZz141m0yRoillc0GFgl6kMREnG6j4E9Zc9x2BqM81GkvoNwWpMr57WccqQVzQP05Vn4V@lists.linux-m68k.org X-Gm-Message-State: AOJu0YyZSJfdw0nlocKGdP6Qs5kmNMVOGp1IirLDsDSO34f7uVjbs+J/ hEZRWjTMgOSqwOHiFne+SBZBEaBGPeVTqdMvo5FnRPjoIR7A0DqeEjhs X-Gm-Gg: ASbGnctLdtH9EuU18ALEe0cV8sfi+omt2dg4TuPX7JUrr4GNAEOtnGkTfAPU6jtnDj2 mPxfoIduh1HtiHuaAHvmYJ+1yK5s88dJhk+9Isva0VwgvgPya4vESxgKZ3SVGyI0VTpKCKoh0xG cZ+g6vmJzbrscaS8EcnwZep9nHEEEghCFSWRQKxUZQ5brhSWwGAc1BGrFqL+/4azGcJNIhBDwnq dKxBRz0lE5v8l3+p/i7m3ScRDGRDa19M2zTLqp4Av0x2QHgWyStiUO98RMMZhFe3AbcUdnCy5dX 8/WvYhej1GU6t2mLEY4wUk1Sxk6L+sCRXsW9IxQU35yOWt4vcZ+JM7wDcHU6WyVjdjR3R9x4/wv hJd25ieG2jgtfBqiAu411Mcv4NBu7XQ== 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-m68k@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