mirrors
/
FunKey-OS
mirror of https://github.com/FunKey-Project/FunKey-OS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed merge conflicts

This commit is contained in:
Vincent-FK 2021-06-20 00:02:27 +02:00
parent 977a7f48db 2155537e62
commit f60111fa45
7 changed files with 60 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
View File

@ -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

1
FunKey/board/funkey/rootfs-overlay/usr/local/sbin/instant_play
View File

@ -103,4 +103,3 @@ EOF
;;
esac
exit 0

3
FunKey/board/funkey/rootfs-overlay/usr/local/sbin/powerdown
View 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

2
Recovery/board/funkey/rootfs-overlay/etc/issue
View File

@ -5,6 +5,6 @@
|___| |_____|__|__||__|\__||_____|___ |
FUN ON A KEYCHAIN |_____|
-----------------------------------------------------
Version 2.1.1 (Recovery)
Version 2.3.0 (Recovery)
-----------------------------------------------------

10
Recovery/board/funkey/rootfs-overlay/etc/os-release
View File

@ -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

2
Recovery/board/funkey/rootfs-overlay/etc/sw-versions
View File

@ -1 +1 @@
Recovery 2.1.1
Recovery 2.3.0