From: Jonatan Schlag <jonatan.schlag@ipfire.org>
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 [thread overview]
Message-ID: <1502533349-13935-2-git-send-email-jonatan.schlag@ipfire.org> (raw)
In-Reply-To: <1502533349-13935-1-git-send-email-jonatan.schlag@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 905 bytes --]
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 <jonatan.schlag(a)ipfire.org>
---
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
next prev parent reply other threads:[~2017-08-12 10:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-12 10:22 [PATCH 1/5] zone: zone_config_check_same_setting check for config to edit Jonatan Schlag
2017-08-12 10:22 ` Jonatan Schlag [this message]
2017-08-12 10:22 ` [PATCH 3/5] header-config: pass id to hook_parse_cmdline Jonatan Schlag
2017-08-12 10:22 ` [PATCH 4/5] config hooks: hook_parse_cmdline take id as an argument Jonatan Schlag
2017-08-12 10:22 ` [PATCH 5/5] config hook: generate new id inside hook_new Jonatan Schlag
2017-08-13 12:10 ` [PATCH 1/5] zone: zone_config_check_same_setting check for config to edit Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1502533349-13935-2-git-send-email-jonatan.schlag@ipfire.org \
--to=jonatan.schlag@ipfire.org \
--cc=network@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox