From d299444adcc02b9a40ba0651059d0ba283108231 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 2 Oct 2013 10:47:11 +0000 Subject: [PATCH] boot-directdisk: avoid loop in MBR disk signature generation Instead of looping until the generated signature is non-zero, just return 'ffffffff' if it's zero. This avoids an infinite loop if the generated signature is always zero. (From OE-Core rev: 34c74ba45c04efc2dd998545bf7a31d7b06a0ee0) Signed-off-by: Jonathan Liu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/boot-directdisk.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index 0f64b44f87..55357283ac 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass @@ -148,11 +148,12 @@ python do_bootdirectdisk() { def generate_disk_signature(): import uuid - while True: - signature = str(uuid.uuid4())[:8] + signature = str(uuid.uuid4())[:8] - if signature != '00000000': - return signature + if signature != '00000000': + return signature + else: + return 'ffffffff' def validate_disk_signature(d): import re