From: Jonathan Liu <net147@gmail.com>
Date: Mon, 31 Jul 2017 10:53:39 +0000 (+1000)
Subject: wic: improve generating disk system identifier
X-Git-Tag: 2017-10~740
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5619e72facbc9228d3cf8f844f198e03b536ac8c;p=openembedded-core.git

wic: improve generating disk system identifier

This should reduce the chance of generating 0xffffffff as the disk
system identifier.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 51bdd3a984..5765bbb527 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -26,6 +26,7 @@
 
 import logging
 import os
+import random
 import shutil
 import tempfile
 import uuid
@@ -303,7 +304,7 @@ class PartitionedImage():
                           # all partitions (in bytes)
         self.ptable_format = ptable_format  # Partition table format
         # Disk system identifier
-        self.identifier = int.from_bytes(os.urandom(4), 'little') or 0xffffffff
+        self.identifier = random.SystemRandom().randint(1, 0xffffffff)
 
         self.partitions = partitions
         self.partimages = []