From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 3/4] ipv6-auto: create hook_parse_cmdline function Date: Wed, 19 Jul 2017 10:52:37 +0200 Message-ID: <1500454358-6561-4-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="===============8924515426188991848==" List-Id: --===============8924515426188991848== 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/ipv6-auto | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/hooks/configs/ipv6-auto b/src/hooks/configs/ipv6-auto index c362797..375e585 100644 --- a/src/hooks/configs/ipv6-auto +++ b/src/hooks/configs/ipv6-auto @@ -30,14 +30,8 @@ hook_check_config_settings() { assert isbool PRIVACY_EXTENSIONS } =20 -hook_new() { - local zone=3D"${1}" - shift - - if zone_config_hook_is_configured ${zone} "ipv6-auto"; then - log ERROR "You can configure the ipv6-auto hook only once for a zone" - return ${EXIT_ERROR} - fi +hook_parse_cmdline() { + local arg =20 while read arg; do case "${arg}" in @@ -52,6 +46,21 @@ hook_new() { ;; esac done <<< "$(args $@)" +} + +hook_new() { + local zone=3D"${1}" + shift + + if zone_config_hook_is_configured ${zone} "ipv6-auto"; then + log ERROR "You can configure the ipv6-auto hook only once for a zone" + return ${EXIT_ERROR} + fi + + 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 --===============8924515426188991848==--