[oe-commits] [openembedded-core] 47/122: masterimage.py: fix issue with calling reboot on masterimage/DUT

[git at git.openembedded.org]

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

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

commit 6f5c4a8e07f8cdf3f6352e9e85d7376937bb32d2
Author: Erik Botö <erik.boto at pelagicore.com>
AuthorDate: Mon Nov 6 10:13:03 2017 -0800

    masterimage.py: fix issue with calling reboot on masterimage/DUT
    
    On systemd systems calling reboot over an ssh connection doesn't
    return as expected causing an exception, therefore wrap the call
    to reboot in order to avoid this issue.
    
    Also sync the filesystems before rebooting cause otherwise, it will be
    done as part of the reboot and could take a very long time and testimage
    will fail to access the machine. This issue was observed consistently with
    one of our rootfs at Pelagicore.
    
    [YOCTO #11524]
    
    Signed-off-by: Erik Botö <erik.boto at pelagicore.com>
    Signed-off-by: Stephano Cetola <stephano.cetola at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Armin Kuster <akuster at mvista.com>
---
 meta/lib/oeqa/controllers/masterimage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py
index 07418fc..fe90967 100644
--- a/meta/lib/oeqa/controllers/masterimage.py
+++ b/meta/lib/oeqa/controllers/masterimage.py
@@ -108,7 +108,7 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta
             time.sleep(10)
             self.power_ctl("cycle")
         else:
-            status, output = conn.run("reboot")
+            status, output = conn.run("sync; { sleep 1; reboot; } > /dev/null &")
             if status != 0:
                 bb.error("Failed rebooting target and no power control command defined. You need to manually reset the device.\n%s" % output)
 

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