luxferre/bananarchy
1
0
Fork 0
Code Issues Actions Activity

Unify Power menu bootloader entry as 'Reboot to loader' into lk2nd Fastboot menu

Browse Source
This commit is contained in:
Luxferre
2026-10-25 08:36:27 +02:00
parent a117e74452
commit fb5b9c9982
12 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlay/rootfs/etc/doas.d/50-sxmo.conf
+1
View File
@@ -31,6 +31,7 @@ permit nopass :wheel as root cmd tee args -a /sys/power/wake_lock
permit nopass :wheel as root cmd tee args -a /sys/power/wake_unlock
permit nopass :wheel as root cmd tee args /sys/power/wakeup_count
permit nopass :wheel as root cmd tee args /sys/module/leds_msm8905_torch/parameters/next_reboot_mode
permit nopass :wheel as root cmd /usr/bin/tee args /sys/module/leds_msm8905_torch/parameters/next_reboot_mode
permit nopass :wheel as root cmd /usr/bin/sxmo_power.sh
permit nopass :wheel as root cmd sxmo_power.sh
permit nopass :wheel as root cmd rc-service args hexagonrpcd-adsp-sensorspd stop
overlay/rootfs/usr/bin/sxmo_appmenu.sh
+1 -2
View File
@@ -210,8 +210,7 @@ getprogchoices() {
$icon_lck Lock (Screen off)^0^sxmo_state.sh set screenoff
$icon_out Logout^0^confirm Logout && sxmo_power.sh logout
$icon_rld Reboot^0^confirm Reboot && sxmo_power.sh reboot
$icon_rld Reboot to Fastboot^0^confirm Fastboot && sxmo_power.sh fastboot
$icon_rld Reboot to EDL^0^confirm EDL && sxmo_power.sh edl
$icon_rld Reboot to loader^0^confirm Loader && sxmo_power.sh loader
$icon_pwr Poweroff^0^confirm Poweroff && sxmo_power.sh poweroff"
;;
modem)
overlay/rootfs/usr/bin/sxmo_power.sh
+8 -7
View File
@@ -8,7 +8,7 @@ export PATH="/sbin:/usr/sbin:$PATH"
. sxmo_common.sh
usage() {
printf "usage: %s [reboot|fastboot|bootloader|edl|poweroff|logout|togglewm]\n" "$(basename "$0")"
printf "usage: %s [reboot|loader|poweroff|logout|togglewm]\n" "$(basename "$0")"
}
run_polkit_login1() {
@@ -93,8 +93,9 @@ set_kernel_reboot_mode() {
rmode="$1"
param_path="/sys/module/leds_msm8905_torch/parameters/next_reboot_mode"
if [ -e "$param_path" ]; then
printf "%s\n" "$rmode" | /usr/bin/doas tee "$param_path" >/dev/null 2>&1 || \
printf "%s\n" "$rmode" > "$param_path" 2>/dev/null || true
printf "%s\n" "$rmode" > "$param_path" 2>/dev/null || \
printf "%s\n" "$rmode" | /usr/bin/doas /usr/bin/tee "$param_path" >/dev/null 2>&1 || \
printf "%s\n" "$rmode" | /usr/bin/doas tee "$param_path" >/dev/null 2>&1 || true
fi
}
@@ -122,13 +123,13 @@ case "$1" in
fi
sxmo_jobs.sh stop all >/dev/null 2>&1 || true
;;
fastboot|bootloader)
loader|fastboot|bootloader)
sync
set_kernel_reboot_mode "bootloader"
set_kernel_reboot_mode "loader"
sxmo_hook_power.sh reboot || true
(sleep 4; force_reboot_cmd "bootloader") &
(sleep 4; force_reboot_cmd "loader") &
if ! run_priv_power reboot; then
force_reboot_cmd "bootloader"
force_reboot_cmd "loader"
fi
sxmo_jobs.sh stop all >/dev/null 2>&1 || true
;;
overlay/rootfs/usr/lib/dwm/plugins/dmenu.so
BIN
View File
Binary file not shown.
overlay/rootfs/usr/share/sxmo/default_hooks/sxmo_hook_contextmenu.sh
+1 -2
View File
@@ -91,8 +91,7 @@ case "$WMCLASS" in
$icon_lck Lock (Screen off) ^ 0 ^ sxmo_state.sh set screenoff
$icon_out Logout ^ 0 ^ confirm Logout && sxmo_power.sh logout
$icon_rld Reboot ^ 0 ^ confirm Reboot && sxmo_power.sh reboot
$icon_rld Reboot to Fastboot ^ 0 ^ confirm Fastboot && sxmo_power.sh fastboot
$icon_rld Reboot to EDL ^ 0 ^ confirm EDL && sxmo_power.sh edl
$icon_rld Reboot to loader ^ 0 ^ confirm Loader && sxmo_power.sh loader
$icon_pwr Poweroff ^ 0 ^ confirm Poweroff && sxmo_power.sh poweroff
"
WINNAME=Power