The dots at the end of log messages can be confusing. Especially behind variables,it is often unclear if the dot was part of the variable or not which make debugging much harder.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- src/functions/functions.settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/functions/functions.settings b/src/functions/functions.settings index 0e50bf1..c73349a 100644 --- a/src/functions/functions.settings +++ b/src/functions/functions.settings @@ -159,7 +159,7 @@ settings_write() { return ${EXIT_ERROR} fi
- log DEBUG "Writing settings file ${settings_file}." + log DEBUG "Writing settings file '${settings_file}'"
mkdir -p $(dirname ${settings_file}) 2>/dev/null > ${settings_file}
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 --- src/functions/functions.ipv6 | 8 -------- src/hooks/configs/ipv4-static | 3 +-- src/hooks/configs/ipv6-static | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/functions/functions.ipv6 b/src/functions/functions.ipv6 index 3e81d3a..e160fb3 100644 --- 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 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} }
-
Jonatan Schlag