From 76ebfa3d80f6513cfb6d8af41164c4d343874d93 Mon Sep 17 00:00:00 2001
From: Stephan Wendel <me@stephanwe.de>
Date: Sat, 25 Mar 2023 00:00:29 +0100
Subject: [PATCH 1/2] refactor: refactor generate DISKID

As discussed in #71 changed behavior to
mentioned code by pelwel.

See https://github.com/RPi-Distro/raspberrypi-sys-mods/pull/71#issuecomment-1484941247
for details.

Signed-off-by: Stephan Wendel <me@stephanwe.de>
---
 usr/lib/raspberrypi-sys-mods/firstboot | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/lib/raspberrypi-sys-mods/firstboot b/usr/lib/raspberrypi-sys-mods/firstboot
index 475134f..752c96e 100755
--- a/usr/lib/raspberrypi-sys-mods/firstboot
+++ b/usr/lib/raspberrypi-sys-mods/firstboot
@@ -63,7 +63,7 @@ get_variables () {
 fix_partuuid() {
   mount -o remount,rw "$ROOT_PART_DEV"
   mount -o remount,rw "$BOOT_PART_DEV"
-  DISKID="$(tr -dc 'a-f0-9' < /dev/hwrng | dd bs=1 count=8 2>/dev/null)"
+  DISKID="$(dd if=/dev/hwrng bs=4 count=1 status=none | od -An -tx4 | cut -c2-9)"
   fdisk "$ROOT_DEV" > /dev/null <<EOF
 x
 i
@@ -223,6 +223,7 @@ main () {
     apply_custom "/boot/custom.toml"
   fi
 
+  whiptail --infobox "Fix PARTUUID..." 20 60
   fix_partuuid
 
   return 0

From 015da43db5f3a87d143344bd828d51ff8fc03f21 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Wed, 29 Mar 2023 07:37:28 +0100
Subject: [PATCH 2/2] 20230329 release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7fe5e7e..c64ac73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+raspberrypi-sys-mods (20230329) bullseye; urgency=medium
+
+  [ Stephan Wendel ]
+  * refactor: refactor generate DISKID
+
+ -- Serge Schneider <serge@raspberrypi.com>  Wed, 29 Mar 2023 07:36:20 +0100
+
 raspberrypi-sys-mods (20221019) bullseye; urgency=medium
 
   [ hungryhorace ]