[oe-commits] Jonathan Liu : boot-directdisk: avoid loop in MBR disk signature generation

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: b6c1dc33afb8b1cbafe665b12fd7a2b78705a782
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b6c1dc33afb8b1cbafe665b12fd7a2b78705a782

Author: Jonathan Liu <net147 at gmail.com>
Date:   Wed Oct  2 10:47:11 2013 +0000

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.

Signed-off-by: Jonathan Liu <net147 at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/boot-directdisk.bbclass |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 0f64b44..5535728 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