diff --git a/bb-beagle-flasher/readme.log b/bb-beagle-flasher/readme.log index c4bd4fd38eaf2acef8ce39f02559aebe7f89a37c..f100a68c47edc588d3f1b09a947233ed335f5aed 100644 --- a/bb-beagle-flasher/readme.log +++ b/bb-beagle-flasher/readme.log @@ -1,3 +1,4 @@ * SK-AM69, support microSD -> usb sata * BBIA64/BeaglePlay, use u-boot versions of script files * Bump FAT partition to 256MB for boot recovery images + * Use /proc/sysrq-trigger to shutdown flasher in single user mode diff --git a/bb-beagle-flasher/suite/bookworm/debian/changelog b/bb-beagle-flasher/suite/bookworm/debian/changelog index 9fad5c926df5b88dd7e954c1b6b5ae8746e8eace..37703bb126b15aa19722a40c096ad63203207b2d 100644 --- a/bb-beagle-flasher/suite/bookworm/debian/changelog +++ b/bb-beagle-flasher/suite/bookworm/debian/changelog @@ -1,8 +1,9 @@ -bb-beagle-flasher (1.20230803.0-0~bookworm+20230803) bookworm; urgency=low +bb-beagle-flasher (1.20230807.0-0~bookworm+20230807) bookworm; urgency=low * SK-AM69, support microSD -> usb sata * BBIA64/BeaglePlay, use u-boot versions of script files * Bump FAT partition to 256MB for boot recovery images + * Use /proc/sysrq-trigger to shutdown flasher in single user mode - -- Robert Nelson <robertcnelson@gmail.com> Thu, 03 Aug 2023 10:50:18 -0500 + -- Robert Nelson <robertcnelson@gmail.com> Mon, 07 Aug 2023 17:05:08 -0500 diff --git a/bb-beagle-flasher/suite/bookworm/debian/init-beagle-flasher b/bb-beagle-flasher/suite/bookworm/debian/init-beagle-flasher index aa86a41c9ac8e2080d4b89512542992bbc2294ed..7d73566f41be2ece2e21488a141da7306aacd0ef 100755 --- a/bb-beagle-flasher/suite/bookworm/debian/init-beagle-flasher +++ b/bb-beagle-flasher/suite/bookworm/debian/init-beagle-flasher @@ -389,7 +389,15 @@ copy_rootfs () { unset are_we_flasher are_we_flasher=$(grep init-beagle-flasher /proc/cmdline || true) if [ ! "x${are_we_flasher}" = "x" ] ; then - message="INFO: [We are init]" ; broadcast + message="INFO: [We are init, trying to shutdown, we may crash, data is RO so safe]" ; broadcast + + if [ -f /proc/sysrq-trigger ] ; then + #For sync + echo s > /proc/sysrq-trigger + #For shutdown the system + echo o > /proc/sysrq-trigger + fi + #When run as init exec /sbin/init exit #We should not hit that diff --git a/bb-beagle-flasher/suite/bullseye/debian/changelog b/bb-beagle-flasher/suite/bullseye/debian/changelog index ce4e470c6d718a225c64db2a7d09076879d78193..d1ffb33322cf398c8f36fb5ebac5322c83b9d102 100644 --- a/bb-beagle-flasher/suite/bullseye/debian/changelog +++ b/bb-beagle-flasher/suite/bullseye/debian/changelog @@ -1,8 +1,9 @@ -bb-beagle-flasher (1.20230803.0-0~bullseye+20230803) bullseye; urgency=low +bb-beagle-flasher (1.20230807.0-0~bullseye+20230807) bullseye; urgency=low * SK-AM69, support microSD -> usb sata * BBIA64/BeaglePlay, use u-boot versions of script files * Bump FAT partition to 256MB for boot recovery images + * Use /proc/sysrq-trigger to shutdown flasher in single user mode - -- Robert Nelson <robertcnelson@gmail.com> Thu, 03 Aug 2023 10:50:18 -0500 + -- Robert Nelson <robertcnelson@gmail.com> Mon, 07 Aug 2023 17:05:08 -0500 diff --git a/bb-beagle-flasher/suite/bullseye/debian/init-beagle-flasher b/bb-beagle-flasher/suite/bullseye/debian/init-beagle-flasher index aa86a41c9ac8e2080d4b89512542992bbc2294ed..7d73566f41be2ece2e21488a141da7306aacd0ef 100755 --- a/bb-beagle-flasher/suite/bullseye/debian/init-beagle-flasher +++ b/bb-beagle-flasher/suite/bullseye/debian/init-beagle-flasher @@ -389,7 +389,15 @@ copy_rootfs () { unset are_we_flasher are_we_flasher=$(grep init-beagle-flasher /proc/cmdline || true) if [ ! "x${are_we_flasher}" = "x" ] ; then - message="INFO: [We are init]" ; broadcast + message="INFO: [We are init, trying to shutdown, we may crash, data is RO so safe]" ; broadcast + + if [ -f /proc/sysrq-trigger ] ; then + #For sync + echo s > /proc/sysrq-trigger + #For shutdown the system + echo o > /proc/sysrq-trigger + fi + #When run as init exec /sbin/init exit #We should not hit that diff --git a/bb-beagle-flasher/suite/jammy/debian/changelog b/bb-beagle-flasher/suite/jammy/debian/changelog index 20d7c287d38d5cca00daaf106b3b4a2533784034..af4c8727d6b8c32084af0ee6b11dddc7524a174c 100644 --- a/bb-beagle-flasher/suite/jammy/debian/changelog +++ b/bb-beagle-flasher/suite/jammy/debian/changelog @@ -1,8 +1,9 @@ -bb-beagle-flasher (1.20230803.0-0~jammy+20230803) jammy; urgency=low +bb-beagle-flasher (1.20230807.0-0~jammy+20230807) jammy; urgency=low * SK-AM69, support microSD -> usb sata * BBIA64/BeaglePlay, use u-boot versions of script files * Bump FAT partition to 256MB for boot recovery images + * Use /proc/sysrq-trigger to shutdown flasher in single user mode - -- Robert Nelson <robertcnelson@gmail.com> Thu, 03 Aug 2023 10:50:18 -0500 + -- Robert Nelson <robertcnelson@gmail.com> Mon, 07 Aug 2023 17:05:08 -0500 diff --git a/bb-beagle-flasher/suite/jammy/debian/init-beagle-flasher b/bb-beagle-flasher/suite/jammy/debian/init-beagle-flasher index aa86a41c9ac8e2080d4b89512542992bbc2294ed..7d73566f41be2ece2e21488a141da7306aacd0ef 100755 --- a/bb-beagle-flasher/suite/jammy/debian/init-beagle-flasher +++ b/bb-beagle-flasher/suite/jammy/debian/init-beagle-flasher @@ -389,7 +389,15 @@ copy_rootfs () { unset are_we_flasher are_we_flasher=$(grep init-beagle-flasher /proc/cmdline || true) if [ ! "x${are_we_flasher}" = "x" ] ; then - message="INFO: [We are init]" ; broadcast + message="INFO: [We are init, trying to shutdown, we may crash, data is RO so safe]" ; broadcast + + if [ -f /proc/sysrq-trigger ] ; then + #For sync + echo s > /proc/sysrq-trigger + #For shutdown the system + echo o > /proc/sysrq-trigger + fi + #When run as init exec /sbin/init exit #We should not hit that diff --git a/bb-beagle-flasher/suite/trixie/debian/changelog b/bb-beagle-flasher/suite/trixie/debian/changelog index dc80ff8307825c89b7d42bf9865b44fc5bb7da94..13eba2c0b8a0b75e71e71f4281dc5fc89a0ef8e9 100644 --- a/bb-beagle-flasher/suite/trixie/debian/changelog +++ b/bb-beagle-flasher/suite/trixie/debian/changelog @@ -1,8 +1,9 @@ -bb-beagle-flasher (1.20230803.0-0~trixie+20230803) trixie; urgency=low +bb-beagle-flasher (1.20230807.0-0~trixie+20230807) trixie; urgency=low * SK-AM69, support microSD -> usb sata * BBIA64/BeaglePlay, use u-boot versions of script files * Bump FAT partition to 256MB for boot recovery images + * Use /proc/sysrq-trigger to shutdown flasher in single user mode - -- Robert Nelson <robertcnelson@gmail.com> Thu, 03 Aug 2023 10:50:18 -0500 + -- Robert Nelson <robertcnelson@gmail.com> Mon, 07 Aug 2023 17:05:08 -0500 diff --git a/bb-beagle-flasher/suite/trixie/debian/init-beagle-flasher b/bb-beagle-flasher/suite/trixie/debian/init-beagle-flasher index aa86a41c9ac8e2080d4b89512542992bbc2294ed..7d73566f41be2ece2e21488a141da7306aacd0ef 100755 --- a/bb-beagle-flasher/suite/trixie/debian/init-beagle-flasher +++ b/bb-beagle-flasher/suite/trixie/debian/init-beagle-flasher @@ -389,7 +389,15 @@ copy_rootfs () { unset are_we_flasher are_we_flasher=$(grep init-beagle-flasher /proc/cmdline || true) if [ ! "x${are_we_flasher}" = "x" ] ; then - message="INFO: [We are init]" ; broadcast + message="INFO: [We are init, trying to shutdown, we may crash, data is RO so safe]" ; broadcast + + if [ -f /proc/sysrq-trigger ] ; then + #For sync + echo s > /proc/sysrq-trigger + #For shutdown the system + echo o > /proc/sysrq-trigger + fi + #When run as init exec /sbin/init exit #We should not hit that diff --git a/bb-beagle-flasher/version.sh b/bb-beagle-flasher/version.sh index 895f3b0bb1e4c00032c613f443dc14b4b3655c10..8b6ddf1b2ea5e93a6851796d80c869302eeac485 100644 --- a/bb-beagle-flasher/version.sh +++ b/bb-beagle-flasher/version.sh @@ -2,7 +2,7 @@ package_name="bb-beagle-flasher" debian_pkg_name="${package_name}" -package_version="1.20230803.0" +package_version="1.20230807.0" package_source="" src_dir="" @@ -17,7 +17,7 @@ debian_patch="" clear_changelog="enable" -bullseye_version="~bullseye+20230803" -bookworm_version="~bookworm+20230803" -trixie_version="~trixie+20230803" -jammy_version="~jammy+20230803" +bullseye_version="~bullseye+20230807" +bookworm_version="~bookworm+20230807" +trixie_version="~trixie+20230807" +jammy_version="~jammy+20230807"