From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: network@lists.ipfire.org Subject: Re: [PATCH] config: remove old hashes Date: Tue, 04 Jul 2017 17:05:03 +0100 Message-ID: <1499184303.2362.3.camel@ipfire.org> In-Reply-To: <1499183882-24548-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3589689835137069096==" List-Id: --===============3589689835137069096== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Hi, could we also drop the ipv6_hash function or is that used somewhere else, too? -Michael On Tue, 2017-07-04 at 17:58 +0200, Jonatan Schlag wrote: > With the new id feature the old hashes are not necessary anymore. > > Signed-off-by: Jonatan Schlag > --- >  src/hooks/configs/ipv4-static | 3 +-- >  src/hooks/configs/ipv6-static | 2 +- >  2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4- > static > index cb00252..c395200 100644 > --- a/src/hooks/configs/ipv4-static > +++ b/src/hooks/configs/ipv4-static > @@ -106,8 +106,7 @@ hook_new() { >   warning "You did not configure a gateway for a non- > local zone" >   fi >   > - # XXX maybe we can add some hashing to identify a > configuration again > - zone_config_settings_write "${zone}" "${HOOK}.$(uuid)" > + zone_config_settings_write "${zone}" "${HOOK}" >   >   exit ${EXIT_OK} >  } > diff --git a/src/hooks/configs/ipv6-static b/src/hooks/configs/ipv6- > static > index 2a5e8e2..f43ef7e 100644 > --- a/src/hooks/configs/ipv6-static > +++ b/src/hooks/configs/ipv6-static > @@ -59,7 +59,7 @@ hook_new() { >   GATEWAY=$(ipv6_format "${GATEWAY}") >   fi >   > - zone_config_settings_write "${zone}" "${HOOK}.$(ipv6_hash > ${ADDRESS}).${PREFIX}" > + zone_config_settings_write "${zone}" "${HOOK}" >   >   exit ${EXIT_OK} >  } --===============3589689835137069096== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlpXN3l2QUFvSkVJQjU4UDl2a0FrSEN3Z1AvMGhoRmhQeHVnbTJZbFBOanVYYWZzUHEK YStzYVNGaFJnSUYvclhkSDBreE42cjVCSGlVSjBxbXUxNC9BWTAxWVlnWWJJbXViQzdiNzNtSE5v elB2VzNSQgpxQjRDcDNmMnUxRXBNN29KYWhKWnJKSnRjRTBCYm0wWk9McUFNb2JIMFpIQUZWWFgv bXZRSzVIRFFCaG1EQzdVCk1tRGovTFJvNU1SeFMxQytJb2J5WG9tK1VLTGlGWXBSSjlrYm5JaUZW SVpHaXQyVVNtSDJvSDA0eUNKVmFUMFoKYkRNMW9SV0lTazZLVXNDTTRwOS95OXNiZzRhKzRXcG10 aG9nZkxEM0cwcFZWVWMwRVB6UTRYQm4yZXJFWHptZwp1cFpyN2hGdjRmWDRIb0tCWTVlbDR2N3Bo WXdBdzRNNENXRVJYSWd2N2V5aVRxYjBaNnZDeXBDbDV2blBUdmlsCktIZWIvL1RScHRJdlUrVGNh bjM5cFg5bkpKRkp4Y3VETXErTThJYjVhMkQ3SlNFeFJOZWR5QldkcUZoa0ludlcKcHlzNHdYaCt5 TXpHVmVZdmVQNUg4T2Y1VW4zVDRYcXlHZnpzanNpRjN1VmQ3dDV5NENkU0lNcy9zbEdlNnZyaQpm bDQ5N0oySTdNalRMU2RndEtWclREYVlMZGxDWHVwM0s1c0tqZGkzdzh4UTl2RU5mSmd3Ykg5Q2NP SUhxbjFMCm9temxuVXVKakM3N1ptbGFzNEVSOWwvYzBjUjRGSjJaMjV5QURhTzBiS01vQ3diSThD eUIrdXRDZDVWMzQyNDgKb0E5NkJRUzV6cmUvZGVPV3JTaU9ZQ2VaenlhbDE2QklSSkNVS2xVRmhM dnF0eUc1TGllQVNyekU3WVE4QndJUQpCbWwvUTlpS0FhbmpCWmxaa1ZkMwo9Q3NhZgotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============3589689835137069096==--