From 41b452ff480851631a777bcf84ba61b6b7fa8380 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 12 Sep 2022 22:16:00 +0200 Subject: [PATCH] Fix Docker key.json corruption check (#2125) * 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 --- .../rootfs-overlay/usr/libexec/docker-failure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildroot-external/rootfs-overlay/usr/libexec/docker-failure b/buildroot-external/rootfs-overlay/usr/libexec/docker-failure index 493b00d71..1fa126641 100755 --- a/buildroot-external/rootfs-overlay/usr/libexec/docker-failure +++ b/buildroot-external/rootfs-overlay/usr/libexec/docker-failure @@ -2,10 +2,10 @@ if [ "$SERVICE_RESULT" = "exit-code" ] && [ "$EXIT_STATUS" = "1" ]; then 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" - 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." - rm -f "/etc/docker/key.json" + rm -f "/mnt/overlay/etc/docker/key.json" fi fi