From patchwork Sun Jul 8 17:57:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [v3, 5/5] configurehood: Don't remove timestamp for checksum comparison From: Adrian Schmutzler X-Patchwork-Id: 876 Message-Id: <1531072659-4217-5-git-send-email-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Sun, 8 Jul 2018 19:57:39 +0200 Timestamps in hood file currently only change if changes are made. Thus, there is no reason to remove them for comparison. This also fixes the wrong quote characters in the script, which changed the script in a way the timestamps aren't removed right now anyway. After this change, a hood reconfiguration may be triggered by just changing the timestamp at the keyxchange. Signed-off-by: Adrian Schmutzler Reviewed-by: Tim Niemeyer Reviewed-by: Fabian Bläse Reviewed-by: Robert Langhammer Tested-by: Fabian Bläse Reviewed-by: Tim Niemeyer --- Changes in v2: Rebase onto hood file rename --- src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood index de722f0..00e3641 100755 --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood @@ -106,10 +106,8 @@ if [ -s "$hoodfiletmp" ]; then # https://pw.freifunk-franken.de/patch/205/ # but without signature, every hood file we get is valid! - catnew="$(cat "$hoodfiletmp" | sed 's/"timestamp”: *"[0-9]*"/"timestamp":0/')" - catold="$(cat "$hoodfileref" 2>/dev/null | sed 's/"timestamp”: *"[0-9]*"/"timestamp":0/')" - sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ") - sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ") + sumnew=$(cat "$hoodfiletmp" 2>/dev/null | sha256sum | cut -f1 -d " ") + sumold=$(cat "$hoodfileref" 2>/dev/null | sha256sum | cut -f1 -d " ") json_load "$(cat "$hoodfiletmp")"