Skip to content

Don't enable rm2fb if it fails to start #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2023
Merged

Don't enable rm2fb if it fails to start #686

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56c2483
Don't enable rm2fb if it fails to start
Eeems May 8, 2023
e522292
Merge branch 'testing' into Eeems-patch-11
Eeems May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions package/display/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ timestamp=2023-04-16T20:53:38Z
maintainer="raisjn <[email protected]>"
license=MIT
url="https://github.com/ddvk/remarkable2-framebuffer"
pkgver=1:0.0.31-1
pkgver=1:0.0.31-2
_release="${pkgver%-*}"
_release="v${_release#*:}"
_libver=1.0.1
Expand Down Expand Up @@ -64,12 +64,19 @@ display() {
configure() {
if [[ $arch = rm2 ]]; then
systemctl daemon-reload
systemctl enable rm2fb --now
# Restart xochitl if it's running
if systemctl --quiet is-active xochitl; then
# Reset the crash count so we don't trigger remarkable-fail
echo "0" > /tmp/crashnum
systemctl restart xochitl
if systemctl enable rm2fb --now; then
# Restart xochitl if it's running
if systemctl --quiet is-active xochitl; then
# Reset the crash count so we don't trigger remarkable-fail
echo "0" > /tmp/crashnum
systemctl restart xochitl
fi
else
systemctl disable rm2fb --now
echo "Failed to start rm2fb. Keeping it disabled for now."
echo "Please check the logs and open an issue:"
echo " https://github.com/toltec-dev/toltec/issues/new"
exit 1
fi
fi
}
Expand Down