From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 2/5] zone: zone_config_settings_write never generate an id Date: Sat, 12 Aug 2017 12:22:26 +0200 Message-ID: <1502533349-13935-2-git-send-email-jonatan.schlag@ipfire.org> In-Reply-To: <1502533349-13935-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5190853745009322997==" List-Id: --===============5190853745009322997== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit We now generate the new id inside the hook_new function. This is required because the hook_parse_cmdline function take now the id of the config as te first argument. Signed-off-by: Jonatan Schlag --- src/functions/functions.zone | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index 941314d..34cc983 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -1410,16 +1410,13 @@ zone_config_settings_read() { } zone_config_settings_write() { - assert [ $# -ge 2 ] + assert [ $# -eq 3 ] local zone="${1}" local hook="${2}" local id=${3} - if ! isset id; then - id=$(zone_config_get_new_id ${zone}) - log DEBUG "ID for the config is: ${id}" - fi + assert isinteger id local args if function_exists "hook_check_config_settings"; then -- 2.6.3 --===============5190853745009322997==--