[oe-commits] Jonathan Liu : boot-directdisk: avoid loop in MBR disk signature generation
git at git.openembedded.org
git at git.openembedded.org
Fri Oct 4 17:14:10 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 34c74ba45c04efc2dd998545bf7a31d7b06a0ee0
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=34c74ba45c04efc2dd998545bf7a31d7b06a0ee0
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
More information about the Openembedded-commits
mailing list