From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 6F33D1D79BE for ; Thu, 14 Aug 2025 05:48:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755150538; cv=none; b=Mre3CxoxwQ3zEdWgcCg2ftjKWea5hv7Tj1Vb1DPfIu7iH7UNHdcx3JLdap3aIThLUFoaEqzY1oCsPp3E72chb/Iifzx9bQvI9pBNpkdxDDBj5ZmPdfHqSMUg7kcCPm0tMmc5FtGuCgPPPu5/jxhJxgVsnLegPxEV+/d/vhoOjGE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755150538; c=relaxed/simple; bh=GGrohtwC6NbDUwDq9BT3jJaIAlNnzGJZIG4kt0idbSQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nAv8s5ozdMSiPKbCrT8L5L0jCeDgtnT5SV8cHDw1GC9QCWA3OtvAHbR7PElzzv3KDCfZm9EFRUHxBLj0kqOwHoTsIp//iSPpHYwXv3tgq6vSPA0pKVuaUfP3BRnUxy8kakhzv2q/GtAdfyaKiH2LHQs/iljrmjv96aX74h59kgk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=bActRxYv; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=5YVVCBbF; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=bActRxYv; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=5YVVCBbF; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="bActRxYv"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="5YVVCBbF"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="bActRxYv"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="5YVVCBbF" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 483EF1F7CD; Thu, 14 Aug 2025 05:48:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1755150524; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IvZ1fIen0Q9X3JJDvdn7/FlFTERaK5IQyVgY5iDRbF0=; b=bActRxYvJenQBkTYZnR4txqLk1mC3lRgbOZcL+us1m1+1s0P/dQ741WfbhcwqD1qN/64UC o0dcPNDPws1tlU4JMbwbD8uK3u+wYaG4rczrK6g8eCSnX4knmQiZPPAF91rc4nmBoKk5Ea pp86ymBBUPtpRxKS9u9XMhFSFrWaWYE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1755150524; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IvZ1fIen0Q9X3JJDvdn7/FlFTERaK5IQyVgY5iDRbF0=; b=5YVVCBbFbRsa5ox52blxc9Qb1fuMKIZ6M+xt0SYshHgety5LMwiEmpffgz8E5Dtl3fCTbV n1WBrkCpasOq8LAw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1755150524; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IvZ1fIen0Q9X3JJDvdn7/FlFTERaK5IQyVgY5iDRbF0=; b=bActRxYvJenQBkTYZnR4txqLk1mC3lRgbOZcL+us1m1+1s0P/dQ741WfbhcwqD1qN/64UC o0dcPNDPws1tlU4JMbwbD8uK3u+wYaG4rczrK6g8eCSnX4knmQiZPPAF91rc4nmBoKk5Ea pp86ymBBUPtpRxKS9u9XMhFSFrWaWYE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1755150524; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IvZ1fIen0Q9X3JJDvdn7/FlFTERaK5IQyVgY5iDRbF0=; b=5YVVCBbFbRsa5ox52blxc9Qb1fuMKIZ6M+xt0SYshHgety5LMwiEmpffgz8E5Dtl3fCTbV n1WBrkCpasOq8LAw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 838A713479; Thu, 14 Aug 2025 05:48:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id kOZMD7p4nWiEYQAAD6G6ig (envelope-from ); Thu, 14 Aug 2025 05:48:42 +0000 From: David Disseldorp To: linux-kbuild@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: linux-next@vger.kernel.org, David Disseldorp Subject: [PATCH v2 2/7] gen_init_cpio: support -o parameter Date: Thu, 14 Aug 2025 15:18:00 +1000 Message-ID: <20250814054818.7266-3-ddiss@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250814054818.7266-1-ddiss@suse.de> References: <20250814054818.7266-1-ddiss@suse.de> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Level: X-Spamd-Result: default: False [-6.80 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Score: -6.80 This is another preparatory change to allow for reflink-optimized cpio archives with file data written / cloned via copy_file_range(). The output file is truncated prior to write, so that it maps to usr/gen_initramfs.sh usage. It may make sense to offer an append option in future, for easier archive concatenation. Signed-off-by: David Disseldorp --- usr/gen_init_cpio.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index d8779fe4b8f1f..563594a0662a6 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c @@ -110,7 +110,7 @@ static int cpio_trailer(void) || push_pad(padlen(offset, 512)) < 0) return -1; - return 0; + return fsync(outfd); } static int cpio_mkslink(const char *name, const char *target, @@ -532,7 +532,7 @@ static int cpio_mkfile_line(const char *line) static void usage(const char *prog) { fprintf(stderr, "Usage:\n" - "\t%s [-t ] [-c] \n" + "\t%s [-t ] [-c] [-o ] \n" "\n" " is a file containing newline separated entries that\n" "describe the files to be included in the initramfs archive:\n" @@ -569,7 +569,8 @@ static void usage(const char *prog) "as mtime for symlinks, directories, regular and special files.\n" "The default is to use the current time for all files, but\n" "preserve modification time for regular files.\n" - "-c: calculate and store 32-bit checksums for file data.\n", + "-c: calculate and store 32-bit checksums for file data.\n" + ": write cpio to this file instead of stdout\n", prog); } @@ -611,7 +612,7 @@ int main (int argc, char *argv[]) default_mtime = time(NULL); while (1) { - int opt = getopt(argc, argv, "t:ch"); + int opt = getopt(argc, argv, "t:cho:"); char *invalid; if (opt == -1) @@ -630,6 +631,16 @@ int main (int argc, char *argv[]) case 'c': do_csum = true; break; + case 'o': + outfd = open(optarg, + O_WRONLY | O_CREAT | O_LARGEFILE | O_TRUNC, + 0600); + if (outfd < 0) { + fprintf(stderr, "failed to open %s\n", optarg); + usage(argv[0]); + exit(1); + } + break; case 'h': case '?': usage(argv[0]); -- 2.43.0