funkey/FunKey-OS
1
0
Fork 0
mirror of https://github.com/FunKey-Project/FunKey-OS.git synced 2025-12-12 15:48:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

display version in Recovery menu

Browse Source 
Signed-off-by: Michel-FK <michel.stempin@funkey-project.com>
This commit is contained in:
Michel-FK 2020-11-10 16:04:18 +01:00
parent ee29b4a1aa
commit 8b3e453756
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Recovery/board/funkey/rootfs-overlay/usr/local/sbin/menu
View File

@ -16,6 +16,11 @@ menu_display () {
case ${entry} in case ${entry} in
0) 0)
# Version
message=" VERSION"
;;
1)
# USB mount/unmount # USB mount/unmount
mount | grep -q /dev/mmcblk0p4 mount | grep -q /dev/mmcblk0p4
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -25,19 +30,19 @@ menu_display () {
fi fi
;; ;;
1) 2)
# USB check # USB check
message=" USB CHECK" message=" USB CHECK"
;; ;;
2) 3)
# USB format # USB format
message=" USB FORMAT" message=" USB FORMAT"
;; ;;
3) 4)
# Network enable/disable # Network enable/disable
if [ -e /mnt/usbnet ]; then if [ -e /mnt/usbnet ]; then
@ -47,13 +52,13 @@ menu_display () {
fi fi
;; ;;
4) 5)
# QR code # QR code
message=" QR CODE" message=" QR CODE"
;; ;;
5) 6)
# Factory tests enable/disable # Factory tests enable/disable
if [ -e /mnt/.assembly_tests ]; then if [ -e /mnt/.assembly_tests ]; then
@ -63,7 +68,7 @@ menu_display () {
fi fi
;; ;;
6) 7)
# Exit Recovery # Exit Recovery
message=" EXIT RECOVERY" message=" EXIT RECOVERY"
@ -79,6 +84,22 @@ menu_run () {
case ${entry} in case ${entry} in
0) 0)
# Version
rootfs_mount=/tmp/rootfs
mkdir -p ${rootfs_mount}
mount -t ext4 -o ro /dev/mmcblk0p2 ${rootfs_mount}
if [ $? -ne 0 ]; then
version_rootfs="???"
else
version_rootfs=$(grep rootfs ${rootfs_mount}/etc/sw-versions | cut -f 2)
fi
umount ${mount_rootfs}
version_recovery=$(grep Recovery /etc/sw-versions | cut -f 2)
notif "${message}^^ Recovery: ${version_recovery}^ rootfs : ${version_rootfs}"
;;
1)
# USB mount/unmount # USB mount/unmount
mount | grep -q /dev/mmcblk0p4 mount | grep -q /dev/mmcblk0p4
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -109,7 +130,7 @@ menu_run () {
fi fi
;; ;;
1) 2)
# USB check # USB check
mount | grep -q /dev/mmcblk0p4 mount | grep -q /dev/mmcblk0p4
@ -134,7 +155,7 @@ menu_run () {
fi fi
;; ;;
2) 3)
# USB format # USB format
mount | grep -q /dev/mmcblk0p4 mount | grep -q /dev/mmcblk0p4
@ -168,7 +189,7 @@ menu_run () {
fi fi
;; ;;
3) 4)
# Network enable/disable # Network enable/disable
mount | grep -q /dev/mmcblk0p4 mount | grep -q /dev/mmcblk0p4
@ -186,14 +207,14 @@ menu_run () {
fi fi
;; ;;
4) 5)
# QR code # QR code
qrencode -o /tmp/qrcode.png "https://www.funkey-project.com/_functions/qrcode/$(get_sid)" qrencode -o /tmp/qrcode.png "https://www.funkey-project.com/_functions/qrcode/$(get_sid)"
fbv -e /tmp/qrcode.png -d 1 fbv -e /tmp/qrcode.png -d 1
;; ;;
5) 6)
# Factory tests enable/disable # Factory tests enable/disable
mount | grep -q /dev/mmcblk0p4 mount | grep -q /dev/mmcblk0p4
@ -211,7 +232,7 @@ menu_run () {
fi fi
;; ;;
6) 7)
notif "^^^^^^^^ RESTARTING...^^^^^^^^" notif "^^^^^^^^ RESTARTING...^^^^^^^^"
normal_mode normal_mode
;; ;;
@ -231,9 +252,9 @@ while true; do
# Key UP pressed or repeat # Key UP pressed or repeat
let entry=${entry}-1 let entry=${entry}-1
let entry=${entry}%7 let entry=${entry}%8
if [ ${entry} -eq -1 ]; then if [ ${entry} -eq -1 ]; then
entry=6 entry=7
fi fi
menu_display ${entry} menu_display ${entry}
;; ;;
@ -242,7 +263,7 @@ while true; do
# Key DOWN pressed or repeat # Key DOWN pressed or repeat
let entry=${entry}+1 let entry=${entry}+1
let entry=${entry}%7 let entry=${entry}%8
menu_display ${entry} menu_display ${entry}
;; ;;