[oe-commits] [openembedded-core] 25/33: scripts/lib/wic/engine: Fix cp's target path for ext* filesystems

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit b9ccf44edccd31264890fa790d6120fc9e2c0238
Author: Leonardo Augusto <leobsd at gmail.com>
AuthorDate: Fri Feb 8 08:35:12 2019 -0800

    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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 scripts/lib/wic/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 4eefc94..951bf30 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.