[oe-commits] [openembedded-core] 02/03: 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 master-next
in repository openembedded-core.

commit 5e7e6ff38acc3c1efd431d44c0663bcc9b1b0b79
Author: Leonardo Augusto <leobsd at gmail.com>
AuthorDate: Fri Feb 8 00:20:05 2019 -0800

    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.
    
    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
    
    Signed-off-by: Leonardo Augusto <leobsd at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 4662c66..b4be796 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 = "echo '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.