From 07fa4783566d22d46ce719a621eee5404932dbbe Mon Sep 17 00:00:00 2001 From: Ioan-Adrian Ratiu Date: Fri, 5 Feb 2016 15:36:57 +0200 Subject: isoimage-isohybrid.py: fix cpio working directory Take `pwd` to be . The %s path is relative to it. The value of %s is "output_folder/build". The current code works as follows: Changing directory to %s and finding the sources (after cd'ing) to cpio with output redirection to %s/initrd.cpio triggers the following error "Error: exec_cmd: cd output_folder/build/INITRD && find . | cpio -o -H newc >output_folder/build/initrd.cpio returned '1' instead of 0" This happens because after the cd, `pwd` is /%s and by the redirect we write the result to to /%s/%s/initrd.cpio which obviously does not exist. Fix this by getting the sources with "find %s" instead of "cd && find ." Signed-off-by: Ioan-Adrian Ratiu Signed-off-by: Ross Burton --- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 62385a223d..31dc9b6ce6 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -174,7 +174,7 @@ class IsoImagePlugin(SourcePlugin): else: msger.error("Couldn't find or build initrd, exiting.\n") - exec_cmd("cd %s && find . | cpio -o -H newc >%s/initrd.cpio " \ + exec_cmd("find %s | cpio -o -H newc >%s/initrd.cpio " \ % (initrd_dir, cr_workdir), as_shell=True) exec_cmd("gzip -f -9 -c %s/initrd.cpio > %s" \ % (cr_workdir, initrd), as_shell=True) -- cgit 1.2.3-korg