Use 'reboot' on initial resize instead of sysrq emergency reboot

This commit is contained in:
Serge Schneider 2021-11-03 17:52:31 +00:00
parent ce8119fc39
commit fd250bd0a3
2 changed files with 8 additions and 3 deletions

6
debian/changelog vendored
View File

@ -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 raspi-config (20211019) bullseye; urgency=medium
* Add switching of glamor acceleration * Add switching of glamor acceleration

View File

@ -7,11 +7,12 @@ reboot_pi () {
if [ "$NOOBS" = "1" ]; then if [ "$NOOBS" = "1" ]; then
if [ "$NEW_KERNEL" = "1" ]; then if [ "$NEW_KERNEL" = "1" ]; then
reboot -f "$BOOT_PART_NUM" reboot -f "$BOOT_PART_NUM"
sleep 5
else else
echo "$BOOT_PART_NUM" > "/sys/module/${BCM_MODULE}/parameters/reboot_part" echo "$BOOT_PART_NUM" > "/sys/module/${BCM_MODULE}/parameters/reboot_part"
fi fi
fi fi
echo b > /proc/sysrq-trigger reboot -f
sleep 5 sleep 5
exit 0 exit 0
} }
@ -193,8 +194,6 @@ fi
mount /boot -o remount,ro mount /boot -o remount,ro
sync sync
echo 1 > /proc/sys/kernel/sysrq
if ! check_commands; then if ! check_commands; then
reboot_pi reboot_pi
fi fi