jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-28 15:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Docker key.json corruption check (#2125)

Browse Source 
* Fix Docker key.json corruption check

Since /etc/docker does not get bind mounted anymore (see #2116),
key.json from the overlay partition is used directly.

* Use -e flag for jq to get useful exit code
This commit is contained in:
Stefan Agner 2022-09-12 22:16:00 +02:00
parent cdf1110f42
commit 78b5aeb82d
No known key found for this signature in database
GPG Key ID: AE01353D1E44747D
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildroot-external/rootfs-overlay/usr/libexec/docker-failure
View File

@ -2,10 +2,10 @@
if [ "$SERVICE_RESULT" = "exit-code" ] && [ "$EXIT_STATUS" = "1" ]; then if [ "$SERVICE_RESULT" = "exit-code" ] && [ "$EXIT_STATUS" = "1" ]; then
echo "Docker exited with exit status 1, this might be caused by corrupted key.json." echo "Docker exited with exit status 1, this might be caused by corrupted key.json."
size=$(stat -c %s "/etc/docker/key.json") size=$(stat -c %s "/mnt/overlay/etc/docker/key.json")
echo "key.json: ${size} bytes" echo "key.json: ${size} bytes"
if ! jq < "/etc/docker/key.json" > /dev/null || [ "${size}" -eq 0 ]; then if ! jq -e < "/mnt/overlay/etc/docker/key.json" > /dev/null || [ "${size}" -eq 0 ]; then
echo "key.json appears to be corrupted, it is not parsable. Removing it." echo "key.json appears to be corrupted, it is not parsable. Removing it."
rm -f "/etc/docker/key.json" rm -f "/mnt/overlay/etc/docker/key.json"
fi fi
fi fi