From fd250bd0a3121c3a90c0cf0d3f87898989089a1f Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Wed, 3 Nov 2021 17:52:31 +0000
Subject: [PATCH] Use 'reboot' on initial resize instead of sysrq emergency
 reboot

---
 debian/changelog                    | 6 ++++++
 usr/lib/raspi-config/init_resize.sh | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46bb42f..75378ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+raspi-config (20211103) bullseye; urgency=medium
+
+  * Use 'reboot' on initial resize instead of sysrq emergency reboot
+
+ -- Serge Schneider <serge@raspberrypi.com>  Wed, 03 Nov 2021 17:50:52 +0000
+
 raspi-config (20211019) bullseye; urgency=medium
 
   * Add switching of glamor acceleration
diff --git a/usr/lib/raspi-config/init_resize.sh b/usr/lib/raspi-config/init_resize.sh
index 3132fa5..7551fdc 100755
--- a/usr/lib/raspi-config/init_resize.sh
+++ b/usr/lib/raspi-config/init_resize.sh
@@ -7,11 +7,12 @@ reboot_pi () {
   if [ "$NOOBS" = "1" ]; then
     if [ "$NEW_KERNEL" = "1" ]; then
       reboot -f "$BOOT_PART_NUM"
+      sleep 5
     else
       echo "$BOOT_PART_NUM" > "/sys/module/${BCM_MODULE}/parameters/reboot_part"
     fi
   fi
-  echo b > /proc/sysrq-trigger
+  reboot -f
   sleep 5
   exit 0
 }
@@ -193,8 +194,6 @@ fi
 mount /boot -o remount,ro
 sync
 
-echo 1 > /proc/sys/kernel/sysrq
-
 if ! check_commands; then
   reboot_pi
 fi