From f986d5908077668b195a7e90eb98a42498e602dd Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler <freifunk@adrianschmutzler.de> Date: Sun, 8 Jul 2018 19:57:39 +0200 Subject: [PATCH] configurehood: Don't remove timestamp for checksum comparison MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 <freifunk@adrianschmutzler.de> Reviewed-by: Tim Niemeyer <tim@tn-x.org> Reviewed-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Robert Langhammer <rlanghammer@web.de> Tested-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Tim Niemeyer <tim@tn-x.org> --- 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 de722f0d..00e36418 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")" -- GitLab