summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Augusto <leobsd@gmail.com>2019-02-08 08:35:12 -0800
committerArmin Kuster <akuster808@gmail.com>2019-04-07 15:09:31 +0530
commitb9ccf44edccd31264890fa790d6120fc9e2c0238 (patch)
tree39ef1f085236ce7542a5507b9d9ba4a0bb63ea16
parent6f53c61dd989045a7075b678c7030421d715bc16 (diff)
downloadopenembedded-core-contrib-b9ccf44edccd31264890fa790d6120fc9e2c0238.tar.gz
openembedded-core-contrib-b9ccf44edccd31264890fa790d6120fc9e2c0238.tar.bz2
openembedded-core-contrib-b9ccf44edccd31264890fa790d6120fc9e2c0238.zip
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) 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>
-rw-r--r--scripts/lib/wic/engine.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 4eefc94b84..951bf30717 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -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