mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
scripts/lib/wic/engine: Fix cp's target path for ext* filesystems
Python subprocess' shell=True defaults to /bin/sh[1][2], which
often refers to a POSIX-compliant shell. As the -e flag is
not defined in the POSIX standard[3], some shells may
interpret "-e" as the first argument to the echo command,
causing the rest of the command line to fail.
In this particular case, "echo -e 'cd {}'" is interpreted
as "-e cd {}", which causes the first line of the command
to fail, and causing cp to always place the source file
in the filesystem's root.
Replacing "echo -e" for a printf command makes this
more portable.
This issue only affects "wic cp" for ext* filesystems.
[1] https://docs.python.org/2/library/subprocess.html
[2] https://docs.python.org/3/library/subprocess.html
[3] http://pubs.opengroup.org/onlinepubs/9699919799
(From OE-Core rev: 9a5b703d4e60c3ccdf80b5289b8e6fc91133fcde)
(From OE-Core rev: bf51d6da725a3d5850c3cbd70fb91b91c08e507f)
Signed-off-by: Leonardo Augusto <leobsd@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
422710e0db
commit
11e09611df
@@ -331,7 +331,7 @@ class Disk:
|
||||
def copy(self, src, pnum, path):
|
||||
"""Copy partition image into wic image."""
|
||||
if self.partitions[pnum].fstype.startswith('ext'):
|
||||
cmd = "echo -e 'cd {}\nwrite {} {}' | {} -w {}".\
|
||||
cmd = "printf 'cd {}\nwrite {} {}' | {} -w {}".\
|
||||
format(path, src, os.path.basename(src),
|
||||
self.debugfs, self._get_part_image(pnum))
|
||||
else: # fat
|
||||
|
||||
Reference in New Issue
Block a user