From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 4/4] ipv4-static: create hook_parse_cmdline function Date: Wed, 19 Jul 2017 10:52:38 +0200 Message-ID: <1500454358-6561-5-git-send-email-jonatan.schlag@ipfire.org> In-Reply-To: <1500454358-6561-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7577821954029377774==" List-Id: --===============7577821954029377774== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This patch just split the parsing of the cmd line into a separate function to allowing an edit with the generic hook_edit funct= ion. Signed-off-by: Jonatan Schlag --- src/hooks/configs/ipv4-static | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4-static index c395200..36629e0 100644 --- a/src/hooks/configs/ipv4-static +++ b/src/hooks/configs/ipv4-static @@ -35,12 +35,9 @@ hook_check_config_settings() { fi } =20 -hook_new() { - local zone=3D"${1}" - assert zone_exists "${zone}" - shift - +hook_parse_cmdline() { local arg + while read -r arg; do local key=3D"$(cli_get_key "${arg}")" local val=3D"$(cli_get_val "${arg}")" @@ -105,6 +102,18 @@ hook_new() { if ! isset GATEWAY && zone_is_nonlocal "${zone}"; then warning "You did not configure a gateway for a non-local zone" fi +} + +hook_new() { + local zone=3D"${1}" + shift + + assert zone_exists "${zone}" + + if ! hook_parse_cmdline $@; then + # Return an error if the parsing of the cmd line fails + return ${EXIT_ERROR} + fi =20 zone_config_settings_write "${zone}" "${HOOK}" =20 --=20 2.6.3 --===============7577821954029377774==--