From d852a3b6e77011e34f2297d55be9fd6c918cb323 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 2 Oct 2020 20:21:00 +0000 Subject: [PATCH] system: use generic filenames for reset trigger Signed-off-by: Ian Leonard --- .../mediacenter/LibreELEC-settings/scripts/factory-reset | 8 ++++---- .../sysutils/busybox/scripts/libreelec-target-generator | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/mediacenter/LibreELEC-settings/scripts/factory-reset b/packages/mediacenter/LibreELEC-settings/scripts/factory-reset index 4053dc8842..c78ee2b9db 100755 --- a/packages/mediacenter/LibreELEC-settings/scripts/factory-reset +++ b/packages/mediacenter/LibreELEC-settings/scripts/factory-reset @@ -40,9 +40,9 @@ show_reset_msg() { echo -e "Please do not reboot or turn off your @DISTRONAME@ device!\n" } -if [ -f /storage/.cache/reset_oe ]; then +if [ -f /storage/.cache/reset_hard ]; then # hard reset - rm -f /storage/.cache/reset_oe + rm -f /storage/.cache/reset_hard get_target if [ -n "${target}" ]; then show_reset_msg @@ -65,9 +65,9 @@ if [ -f /storage/.cache/reset_oe ]; then echo StartProgress countdown "Rebooting in 5s... " 5 "NOW" fi -elif [ -f /storage/.cache/reset_xbmc ]; then +elif [ -f /storage/.cache/reset_soft ]; then # soft reset - rm -f /storage/.cache/reset_xbmc + rm -f /storage/.cache/reset_soft get_target if [ -n "${target}" ]; then show_reset_msg diff --git a/packages/sysutils/busybox/scripts/libreelec-target-generator b/packages/sysutils/busybox/scripts/libreelec-target-generator index aae6b4b44c..edb902c5fb 100755 --- a/packages/sysutils/busybox/scripts/libreelec-target-generator +++ b/packages/sysutils/busybox/scripts/libreelec-target-generator @@ -36,7 +36,7 @@ done if [ -f /storage/.please_resize_me ]; then TARGET="fs-resize.target" -elif [ -f /storage/.cache/reset_oe -o -f /storage/.cache/reset_xbmc ]; then +elif [ -f /storage/.cache/reset_hard -o -f /storage/.cache/reset_soft ]; then TARGET="factory-reset.target" elif [ -f "$BACKUP_FILE" ]; then TARGET="backup-restore.target"