[OE-core] [PATCH 1/4] masterimage.py: fix issue with calling reboot on masterimage/DUT

[Erik Botö]

On 2017-05-19 16:59, Leonardo Sandoval wrote:

> On Fri, 2017-05-19 at 16:20 +0200, Erik Botö wrote:
>> 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.
>>
>> Signed-off-by: Erik Botö <erik.boto at pelagicore.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 07418fcda1..6cdcfa3068 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("{ sleep 1; reboot; } > /dev/null &")
> what would make the difference having the sleep before reboot?

It's an extra safety measure to make sure that reboot hasn't had time to 
do anything before the command returns. Inspired by: 
https://unix.stackexchange.com/questions/58271/closing-connection-after-executing-reboot-using-ssh-command

>
>>               if status != 0:
>>                   bb.error("Failed rebooting target and no power control command defined. You need to manually reset the device.\n%s" % output)
>>   
>> -- 
>> 2.11.0
>>
>