Merge pull request #71 from KwadFan/fix/firstboot

fix: fixes hanging firstboot with kernel 6.1y
RPi-Distro · Mar 29, 2023 · 346005c · 346005c
2 parents e44e454 + 015da43
commit 346005c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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 ]

diff --git 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