summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@suse.de>2025-08-19 13:05:48 +1000
committerNathan Chancellor <nathan@kernel.org>2025-08-20 16:02:56 -0700
commit9135564db4904e82a3207bd2d134ca64ce618047 (patch)
tree300e6964148ac0572c3a33a3cc4788370528a72a /usr
parent348ff9e3c1cf1a4124be1c94937dfc131bf6be29 (diff)
gen_initramfs.sh: use gen_init_cpio -o parameter
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>
Diffstat (limited to 'usr')
-rwxr-xr-xusr/gen_initramfs.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/gen_initramfs.sh b/usr/gen_initramfs.sh
index 14b5782f961a..7eba2fddf0ef 100755
--- a/usr/gen_initramfs.sh
+++ b/usr/gen_initramfs.sh
@@ -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