summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLeonardo Augusto <leobsd@gmail.com>2019-02-08 08:35:12 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 22:27:40 +0000
commit11e09611df3dcd4968ea7d84cf2929ac33ebdf26 (patch)
treef946e0cb466c75407d8f1c207cc2f96739f2c07f /scripts
parent422710e0db921616a05cffc85be28e128e7188fa (diff)
downloadpoky-11e09611df3dcd4968ea7d84cf2929ac33ebdf26.tar.gz
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>
Diffstat (limited to 'scripts')
-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 4662c665c0..97f5e848cc 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -331,7 +331,7 @@ class Disk:
331 def copy(self, src, pnum, path): 331 def copy(self, src, pnum, path):
332 """Copy partition image into wic image.""" 332 """Copy partition image into wic image."""
333 if self.partitions[pnum].fstype.startswith('ext'): 333 if self.partitions[pnum].fstype.startswith('ext'):
334 cmd = "echo -e 'cd {}\nwrite {} {}' | {} -w {}".\ 334 cmd = "printf 'cd {}\nwrite {} {}' | {} -w {}".\
335 format(path, src, os.path.basename(src), 335 format(path, src, os.path.basename(src),
336 self.debugfs, self._get_part_image(pnum)) 336 self.debugfs, self._get_part_image(pnum))
337 else: # fat 337 else: # fat