|
@@ -11,8 +11,6 @@ getkey() {
|
|
|
# Display meny item
|
|
|
menu_display () {
|
|
|
local entry=${1}
|
|
|
-
|
|
|
- #clear_notif
|
|
|
case ${entry} in
|
|
|
0)
|
|
|
|
|
@@ -46,9 +44,9 @@ menu_display () {
|
|
|
|
|
|
# Network enable/disable
|
|
|
if [ -e /mnt/usbnet ]; then
|
|
|
- message=" NETWORK DISABLE"
|
|
|
+ message=" NETWORK: ENABLED"
|
|
|
else
|
|
|
- message=" NETWORK ENABLE"
|
|
|
+ message=" NETWORK: DISABLED"
|
|
|
fi
|
|
|
;;
|
|
|
|
|
@@ -63,9 +61,9 @@ menu_display () {
|
|
|
# Factory tests enable/disable
|
|
|
RUN_ENV_VAR=$(fw_printenv -n assembly_tests 2>/dev/null)
|
|
|
if [ "x${RUN_ENV_VAR}" == "x1" ]; then
|
|
|
- message=" FACTORY TESTS DISABLE"
|
|
|
+ message=" FACTORY TESTS: ENABLED"
|
|
|
else
|
|
|
- message=" FACTORY TESTS ENABLE"
|
|
|
+ message=" FACTORY TESTS: DISABLED"
|
|
|
fi
|
|
|
;;
|
|
|
|
|
@@ -74,9 +72,9 @@ menu_display () {
|
|
|
# First boot enable/disable
|
|
|
FIRST_BOOT_OK_ENV_VAR=$(fw_printenv -n first_boot_ok 2>/dev/null)
|
|
|
if [ "x${FIRST_BOOT_OK_ENV_VAR}" == "x1" ]; then
|
|
|
- message=" FIRST BOOT DISABLE"
|
|
|
+ message=" FIRST BOOT: DISABLED"
|
|
|
else
|
|
|
- message=" FACTORY TESTS ENABLE"
|
|
|
+ message=" FIRST BOOT: ENABLED"
|
|
|
fi
|
|
|
;;
|
|
|
|
|
@@ -92,7 +90,7 @@ menu_display () {
|
|
|
message=" SHUTDOWN"
|
|
|
;;
|
|
|
esac
|
|
|
- notif "${message}"
|
|
|
+ notif set 0 "${message}"
|
|
|
}
|
|
|
|
|
|
# Run menu item
|
|
@@ -114,7 +112,7 @@ menu_run () {
|
|
|
umount ${rootfs_mount}
|
|
|
version_recovery=$(grep Recovery /etc/sw-versions | cut -f 2)
|
|
|
ip_addr=$(ifconfig usb0 | grep "inet " | awk -F'[: ]+' '{ print $4 }')
|
|
|
- notif "${message}^^ Recovery: ${version_recovery}^ rootfs : ${version_rootfs}^ IP addr : ${ip_addr}"
|
|
|
+ notif set 0 "${message}^^ Recovery: ${version_recovery}^ rootfs : ${version_rootfs}^ IP addr : ${ip_addr}"
|
|
|
;;
|
|
|
|
|
|
1)
|
|
@@ -122,31 +120,31 @@ menu_run () {
|
|
|
# USB mount/unmount
|
|
|
mount | grep -q /dev/mmcblk0p4
|
|
|
if [ $? -eq 0 ]; then
|
|
|
- notif "${message}..."
|
|
|
+ notif set 0 "${message}..."
|
|
|
share start
|
|
|
if [ $? -ne 0 ]; then
|
|
|
- notif "${message}...^CANNOT MOUNT USB!"
|
|
|
+ notif set 0 "${message}...^CANNOT MOUNT USB!"
|
|
|
else
|
|
|
message=" USB UNMOUNT"
|
|
|
- notif "${message}"
|
|
|
+ notif set 0 "${message}"
|
|
|
fi
|
|
|
else
|
|
|
- notif "${message}..."
|
|
|
+ notif set 0 "${message}..."
|
|
|
share stop
|
|
|
if [ $? -ne 0 ]; then
|
|
|
- notif "${message}...^CANNOT UNMOUNT USB!"
|
|
|
+ notif set 0 "${message}...^CANNOT UNMOUNT USB!"
|
|
|
else
|
|
|
for file in $(ls /mnt/FunKey-*.fwu); do
|
|
|
swupdate -i "${file}"
|
|
|
if [ $? -ne 0 ]; then
|
|
|
- notif_disp 10 "${message}...^ CORRUPTED^ UPDATE FILE"
|
|
|
+ notif set 0 display 10 "${message}...^ CORRUPTED^ UPDATE FILE"
|
|
|
rm -f "${file}"
|
|
|
- notif "^^^^^^^^ RESTARTING...^^^^^^^^"
|
|
|
+ notif set 0 "^^^^^^^^ RESTARTING...^^^^^^^^"
|
|
|
normal_mode
|
|
|
fi
|
|
|
done
|
|
|
message=" USB MOUNT"
|
|
|
- notif "${message}"
|
|
|
+ notif set 0 "${message}"
|
|
|
fi
|
|
|
fi
|
|
|
;;
|
|
@@ -156,23 +154,23 @@ menu_run () {
|
|
|
# USB check
|
|
|
mount | grep -q /dev/mmcblk0p4
|
|
|
if [ $? -eq 0 ]; then
|
|
|
- notif "${message}..."
|
|
|
+ notif set 0 "${message}..."
|
|
|
umount /mnt >/dev/null 2>&1
|
|
|
if [ $? -ne 0 ]; then
|
|
|
- notif "${message}...^CANNOT CHECK USB!"
|
|
|
+ notif set 0 "${message}...^CANNOT CHECK USB!"
|
|
|
fi
|
|
|
fsck.fat -a -v -w /dev/mmcblk0p4
|
|
|
if [ $? -ne 0 ]; then
|
|
|
- notif "${message}...^CANNOT CHECK USB!"
|
|
|
+ notif set 0 "${message}...^CANNOT CHECK USB!"
|
|
|
fi
|
|
|
mount /mnt
|
|
|
if [ $? -ne 0 ]; then
|
|
|
- notif "${message}...^CANNOT CHECK USB!"
|
|
|
+ notif set 0 "${message}...^CANNOT CHECK USB!"
|
|
|
else
|
|
|
- notif "${message} DONE"
|
|
|
+ notif set 0 "${message} DONE"
|
|
|
fi
|
|
|
else
|
|
|
- notif "${message}...^CANNOT CHECK USB WHEN MOUNTED!"
|
|
|
+ notif set 0 "${message}...^CANNOT CHECK USB WHEN MOUNTED!"
|
|
|
fi
|
|
|
;;
|
|
|
|
|
@@ -181,7 +179,7 @@ menu_run () {
|
|
|
# USB format
|
|
|
mount | grep -q /dev/mmcblk0p4
|
|
|
if [ $? -eq 0 ]; then
|
|
|
- notif "${message}...^PRESS A TO CONFIRM"
|
|
|
+ notif set 0 "${message}...^PRESS A TO CONFIRM"
|
|
|
while true; do
|
|
|
case $(getkey) in
|
|
|
1e0001|1e0002)
|
|
@@ -189,9 +187,9 @@ menu_run () {
|
|
|
mkfs.vfat /dev/mmcblk0p4 &&
|
|
|
mount /mnt
|
|
|
if [ $? -ne 0 ]; then
|
|
|
- notif "${message}...^CANNOT FORMAT USB!"
|
|
|
+ notif set 0 "${message}...^CANNOT FORMAT USB!"
|
|
|
else
|
|
|
- notif "${message} DONE"
|
|
|
+ notif set 0 "${message} DONE"
|
|
|
fi
|
|
|
break
|
|
|
;;
|
|
@@ -200,13 +198,13 @@ menu_run () {
|
|
|
;;
|
|
|
|
|
|
*)
|
|
|
- notif "${message}...^ABORTED!"
|
|
|
+ notif set 0 "${message}...^ABORTED!"
|
|
|
break
|
|
|
;;
|
|
|
esac
|
|
|
done
|
|
|
else
|
|
|
- notif "${message}...^CANNOT FORMAT USB WHEN MOUNTED!"
|
|
|
+ notif set 0 "${message}...^CANNOT FORMAT USB WHEN MOUNTED!"
|
|
|
fi
|
|
|
;;
|
|
|
|
|
@@ -217,14 +215,14 @@ menu_run () {
|
|
|
if [ $? -eq 0 ]; then
|
|
|
if [ -e /mnt/usbnet ]; then
|
|
|
rm -f /mnt/usbnet
|
|
|
- message=" NETWORK ENABLE"
|
|
|
+ message=" NETWORK: DISABLED"
|
|
|
else
|
|
|
touch /mnt/usbnet
|
|
|
- message=" NETWORK DISABLE"
|
|
|
+ message=" NETWORK: ENABLED"
|
|
|
fi
|
|
|
- notif "${message}"
|
|
|
+ notif set 0 "${message}"
|
|
|
else
|
|
|
- notif "${message}...^CANNOT CHANGE NET IF MOUNTED!"
|
|
|
+ notif set 0 "${message}...^CANNOT CHANGE NET IF MOUNTED!"
|
|
|
fi
|
|
|
;;
|
|
|
|
|
@@ -241,12 +239,12 @@ menu_run () {
|
|
|
RUN_ENV_VAR=$(fw_printenv -n assembly_tests 2>/dev/null)
|
|
|
if [ "x${RUN_ENV_VAR}" == "x1" ]; then
|
|
|
fw_setenv assembly_tests 0
|
|
|
- message=" FACTORY TESTS ENABLE"
|
|
|
+ message=" FACTORY TESTS: DISABLED"
|
|
|
else
|
|
|
fw_setenv assembly_tests 1
|
|
|
- message=" FACTORY TESTS DISABLE"
|
|
|
+ message=" FACTORY TESTS: ENABLED"
|
|
|
fi
|
|
|
- notif "${message}"
|
|
|
+ notif set 0 "${message}"
|
|
|
;;
|
|
|
|
|
|
7)
|
|
@@ -255,21 +253,21 @@ menu_run () {
|
|
|
FIRST_BOOT_OK_ENV_VAR=$(fw_printenv -n first_boot_ok 2>/dev/null)
|
|
|
if [ "x${FIRST_BOOT_OK_ENV_VAR}" == "x1" ]; then
|
|
|
fw_setenv first_boot_ok
|
|
|
- message=" FIRST BOOT ENABLE"
|
|
|
+ message=" FIRST BOOT: ENABLED"
|
|
|
else
|
|
|
fw_setenv first_boot_ok 1
|
|
|
- message=" FIRST BOOT DISABLE"
|
|
|
+ message=" FIRST BOOT: DISABLED"
|
|
|
fi
|
|
|
- notif "${message}"
|
|
|
+ notif set 0 "${message}"
|
|
|
;;
|
|
|
|
|
|
8)
|
|
|
- notif "^^^^^^^^ RESTARTING...^^^^^^^^"
|
|
|
+ notif set 0 "^^^^^^^^ RESTARTING...^^^^^^^^"
|
|
|
normal_mode
|
|
|
;;
|
|
|
|
|
|
9)
|
|
|
- notif "^^^^^^^^ SHUTDOWN...^^^^^^^^"
|
|
|
+ notif set 0 "^^^^^^^^ SHUTDOWN...^^^^^^^^"
|
|
|
poweroff
|
|
|
;;
|
|
|
esac
|