[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8169/8267] masterimage.py: fix issue with calling reboot on masterimage/DUT

[Emmanuele Bassi <ebassi src gnome org>]

commit ab31d76bc8f69ba82283df145941262a472d9772
Author: Erik Botö <erik boto pelagicore com>
Date:   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]
    
    (From OE-Core rev: 6f5c4a8e07f8cdf3f6352e9e85d7376937bb32d2)
    
    Signed-off-by: Erik Botö <erik boto pelagicore com>
    Signed-off-by: Stephano Cetola <stephano cetola linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Armin Kuster <akuster mvista com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/controllers/masterimage.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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)