fixed merge conflicts
This commit is contained in:
Vincent-FK
commit
f60111fa45
|
|
@ -18,7 +18,7 @@ touch ${LOCK_FILE}
|
|||
|
||||
## Register ourself as the running FunKey task for receiving USR1
|
||||
## signal for shutting down
|
||||
echo $$ > "/var/run/funkey.pid"
|
||||
pid record $$
|
||||
|
||||
## Binaries
|
||||
PROD_SCREEN_BIN="/usr/local/sbin/funkey_prod_screens"
|
||||
|
|
@ -224,7 +224,7 @@ function launch_tests_up_until_magnet {
|
|||
|
||||
## Register ourself back as the running FunKey task for receiving USR1
|
||||
## signal for shutting down
|
||||
echo $$ > "/var/run/funkey.pid"
|
||||
pid record $$
|
||||
|
||||
# check magnet test result
|
||||
if [[ "$res" == "0" ]]; then
|
||||
|
|
|
|||
|
|
@ -23,46 +23,46 @@ fi
|
|||
|
||||
case ${1} in
|
||||
load)
|
||||
if [ ${#} -ne 1 ]; then
|
||||
usage
|
||||
fi
|
||||
|
||||
# Umount any remaining OPK, if any
|
||||
umount /opk >/dev/null 2>&1
|
||||
|
||||
# Mount last OPK, if any
|
||||
if [ -r "${LAST_OPK_FILE}" ]; then
|
||||
last_opk=$(cat "${LAST_OPK_FILE}")
|
||||
mount -t squashfs "${last_opk}" /opk
|
||||
fi
|
||||
|
||||
# Remove unnecessary files
|
||||
rm -f "${RESUME_PLAY_FILE}"
|
||||
|
||||
# Launch Previous Game if any
|
||||
if [ -f "${INSTANT_PLAY_FILE}" ]; then
|
||||
keymap resume
|
||||
echo -n "Found Instant Play file, restarting previous game with command: "
|
||||
cat "${INSTANT_PLAY_FILE}"
|
||||
mv "${INSTANT_PLAY_FILE}" "${RESUME_PLAY_FILE}"
|
||||
source "${RESUME_PLAY_FILE}"
|
||||
rm -f "${RESUME_PLAY_FILE}"
|
||||
keymap default
|
||||
termfix_all
|
||||
fi
|
||||
|
||||
# Unmount last OPK, if any
|
||||
if [ -r "${LAST_OPK_FILE}" -a ! -f "${REBOOTING_FILE}" ]; then
|
||||
umount /opk
|
||||
rm "${LAST_OPK_FILE}"
|
||||
if [ ${#} -ne 1 ]; then
|
||||
usage
|
||||
fi
|
||||
;;
|
||||
|
||||
# Umount any remaining OPK, if any
|
||||
umount /opk >/dev/null 2>&1
|
||||
|
||||
# Mount last OPK, if any
|
||||
if [ -r "${LAST_OPK_FILE}" ]; then
|
||||
last_opk=$(cat "${LAST_OPK_FILE}")
|
||||
mount -t squashfs "${last_opk}" /opk
|
||||
fi
|
||||
|
||||
# Remove unnecessary files
|
||||
rm -f "${RESUME_PLAY_FILE}"
|
||||
|
||||
# Launch Previous Game if any
|
||||
if [ -f "${INSTANT_PLAY_FILE}" ]; then
|
||||
keymap resume
|
||||
echo -n "Found Instant Play file, restarting previous game with command: "
|
||||
cat "${INSTANT_PLAY_FILE}"
|
||||
mv "${INSTANT_PLAY_FILE}" "${RESUME_PLAY_FILE}"
|
||||
source "${RESUME_PLAY_FILE}"
|
||||
rm -f "${RESUME_PLAY_FILE}"
|
||||
keymap default
|
||||
termfix_all
|
||||
fi
|
||||
|
||||
# Unmount last OPK, if any
|
||||
if [ -r "${LAST_OPK_FILE}" -a ! -f "${REBOOTING_FILE}" ]; then
|
||||
umount /opk
|
||||
rm "${LAST_OPK_FILE}"
|
||||
fi
|
||||
;;
|
||||
|
||||
save)
|
||||
if [ ${#} -lt 2 ]; then
|
||||
usage
|
||||
fi
|
||||
shift
|
||||
if [ ${#} -lt 2 ]; then
|
||||
usage
|
||||
fi
|
||||
shift
|
||||
|
||||
# Get curent binary real path
|
||||
bin=$(printf %s "$1" | sed "s/'/'\\\\''/g")
|
||||
|
|
@ -76,31 +76,30 @@ save)
|
|||
printf "' " >> "${INSTANT_PLAY_FILE}"
|
||||
shift
|
||||
|
||||
while [ "$#" != "0" ]
|
||||
do
|
||||
while [ "$#" != "0" ]
|
||||
do
|
||||
printf "'" >> "${INSTANT_PLAY_FILE}"
|
||||
printf %s "$1" | sed "s/'/'\\\\''/g" >> "${INSTANT_PLAY_FILE}"
|
||||
printf "' " >> "${INSTANT_PLAY_FILE}"
|
||||
shift
|
||||
done
|
||||
done
|
||||
|
||||
# Add the magic sauce to launch the process in background,
|
||||
# record the PID into a file, wait for the process to
|
||||
# terminate and erase the recorded PID
|
||||
cat << EOF >> "${INSTANT_PLAY_FILE}"
|
||||
# Add the magic sauce to launch the process in background,
|
||||
# record the PID into a file, wait for the process to
|
||||
# terminate and erase the recorded PID
|
||||
cat << EOF >> "${INSTANT_PLAY_FILE}"
|
||||
&
|
||||
pid record \$!
|
||||
wait \$!
|
||||
pid erase
|
||||
EOF
|
||||
|
||||
# Now terminate gracefully
|
||||
exec powerdown now
|
||||
;;
|
||||
# Now terminate gracefully
|
||||
exec powerdown now
|
||||
;;
|
||||
|
||||
*)
|
||||
usage
|
||||
;;
|
||||
usage
|
||||
;;
|
||||
esac
|
||||
exit 0
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ case "${1}" in
|
|||
erase_pid
|
||||
;;
|
||||
|
||||
print)
|
||||
print)
|
||||
cat "${PID_FILE}"
|
||||
;;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
#set -x
|
||||
|
||||
SELF="$(basename ${0})"
|
||||
PID_FILE="/var/run/funkey.pid"
|
||||
REBOOTING_FILE="/run/rebooting"
|
||||
|
||||
usage() {
|
||||
|
|
@ -18,7 +17,7 @@ schedule_powerdown() {
|
|||
|
||||
# Send USR1 signal to the running FunKey process to warn about
|
||||
# impending shutdown
|
||||
pkill -USR1 -F "${PID_FILE}" > /dev/null 2>&1
|
||||
pkill -USR1 "$(pid print)" > /dev/null 2>&1
|
||||
|
||||
# Delay for the given grace period seconds to catch signal USR2.
|
||||
# If the signal is caught, then it means the running FunKey
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
|___| |_____|__|__||__|\__||_____|___ |
|
||||
FUN ON A KEYCHAIN |_____|
|
||||
-----------------------------------------------------
|
||||
Version 2.1.1 (Recovery)
|
||||
Version 2.3.0 (Recovery)
|
||||
-----------------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
NAME="FunKey-OS Recovery"
|
||||
VERSION="2.1.1 (Vitriolic Vulture)"
|
||||
VERSION="2.3.0 (Zen Zebu)"
|
||||
ID=funkey-recovery
|
||||
ID_LIKE=buildroot
|
||||
PRETTY_NAME="FunKey-OS Recovery 2.1.1"
|
||||
VERSION_ID="2.1.1"
|
||||
PRETTY_NAME="FunKey-OS Recovery 2.3.0"
|
||||
VERSION_ID="2.3.0"
|
||||
HOME_URL="https://www.funkey-project.com/"
|
||||
SUPPORT_URL="https://www.funkey-project.com/"
|
||||
BUG_REPORT_URL="https://www.funkey-project.com/"
|
||||
PRIVACY_POLICY_URL="https://www.funkey-project.com"
|
||||
VERSION_CODENAME=Vitriolic
|
||||
UBUNTU_CODENAME=Vitriolic
|
||||
VERSION_CODENAME=Zen
|
||||
UBUNTU_CODENAME=Zen
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Recovery 2.1.1
|
||||
Recovery 2.3.0
|
||||
|
|
|
|||
Loading…
Reference in New Issue