From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Wed, 19 Jul 2017 08:52:37 +0000 (+0200)
Subject: ipv6-auto: create hook_parse_cmdline function
X-Git-Tag: 009~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ca65afb187a6f0efd33d3372364578ceb40c29c;p=network.git

ipv6-auto: create hook_parse_cmdline function

This patch just split the parsing of the cmd line
into a separate function to allowing an edit with the generic hook_edit function.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/hooks/configs/ipv6-auto b/src/hooks/configs/ipv6-auto
index c3627975..375e585d 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
 }
 
-hook_new() {
-	local zone="${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
 
 	while read arg; do
 		case "${arg}" in
@@ -52,6 +46,21 @@ hook_new() {
 				;;
 		esac
 	done <<< "$(args $@)"
+}
+
+hook_new() {
+	local zone="${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
 
 	zone_config_settings_write "${zone}" "${HOOK}"