config: remove old hashes

With the new id feature the old hashes are not necessary anymore.
The ipv6_hash function is dropped because we need this function no more.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/functions/functions.ipv6 b/src/functions/functions.ipv6
index 3e81d3a67a65dd022724413f07f4a1b0df06530c..e160fb31758b0ce33a7c012d8beebbdfd8582b3e 100644 (file)
--- a/src/functions/functions.ipv6
+++ b/src/functions/functions.ipv6
@@ -446,14 +446,6 @@ ipv6_addr_le() {
        ipv6_addr_eq $@ || ! ipv6_addr_gt $@
 }
 
-ipv6_hash() {
-       local address="${1}"
-       assert isset address
-
-       address="$(ipv6_format "${address}")"
-       echo "${address//:/}"
-}
-
 ipv6_get_network() {
        ip_get_network $@
 }

diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4-static
index cb002526ab1f3c66f7f7db0627e1a1cd604187b9..c39520048da51264dfc0f197c3b58901a21317eb 100644 (file)
--- 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 2a5e8e2c022fe8afa82f3bf953766343203219ad..f43ef7ec34f495102567e987b70e87946435cb3c 100644 (file)
--- 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}
 }