]> www.infradead.org Git - users/hch/misc.git/commitdiff
gen_initramfs.sh: use gen_init_cpio -o parameter
authorDavid Disseldorp <ddiss@suse.de>
Tue, 19 Aug 2025 03:05:48 +0000 (13:05 +1000)
committerNathan Chancellor <nathan@kernel.org>
Wed, 20 Aug 2025 23:02:56 +0000 (16:02 -0700)
gen_init_cpio can now write to a file directly, so use it when
gen_initramfs.sh is called with -o (e.g. usr/Makefile invocation).

Signed-off-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Nicolas Schier <nsc@kernel.org>
Link: https://lore.kernel.org/r/20250819032607.28727-6-ddiss@suse.de
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
usr/gen_initramfs.sh

index 14b5782f961a870da545da70e13f9ce8a0d936f5..7eba2fddf0ef2e4dd3a9000fe6203e16892d1207 100755 (executable)
@@ -193,7 +193,8 @@ root_gid=0
 dep_list=
 timestamp=
 cpio_list=$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)
-output="/dev/stdout"
+# gen_init_cpio writes to stdout by default
+output=""
 
 trap "rm -f $cpio_list" EXIT
 
@@ -207,7 +208,7 @@ while [ $# -gt 0 ]; do
                        shift
                        ;;
                "-o")   # generate cpio image named $1
-                       output="$1"
+                       output="-o $1"
                        shift
                        ;;
                "-u")   # map $1 to uid=0 (root)
@@ -246,4 +247,4 @@ done
 
 # If output_file is set we will generate cpio archive
 # we are careful to delete tmp files
-usr/gen_init_cpio $timestamp $cpio_list > $output
+usr/gen_init_cpio $output $timestamp $cpio_list