X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=blobdiff_plain;f=src%2Fhooks%2Fports%2Fvlan;h=97b69851742ea56c8cc9574a197d4f21e83395c4;hp=384ad50f7dcbfc68fd364e477eb03a72d0e1f373;hb=f24529e498b1c3fe60196c34356e5b005a22ae4c;hpb=5338fb1423a84f9faeb597a2b67606fff1f6d6ab

diff --git a/src/hooks/ports/vlan b/src/hooks/ports/vlan
index 384ad50f..97b69851 100644
--- a/src/hooks/ports/vlan
+++ b/src/hooks/ports/vlan
@@ -23,39 +23,39 @@
 
 HOOK_SETTINGS=(
 	"ADDRESS"
+	"ID"
 	"PARENT_PORT"
-	"TAG"
 )
 
 PORT_PARENTS_VAR="PARENT_PORT"
 
 hook_check_settings() {
 	assert isset PARENT_PORT
-	assert isinteger TAG
+	assert isinteger ID
 
 	if isset ADDRESS; then
 		assert ismac ADDRESS
 	fi
 
-	if [ ${TAG} -gt 4096 ]; then
-		error "TAG is greater than 4096."
+	if [ ${ID} -gt 4096 ]; then
+		error "ID is greater than 4096."
 		exit ${EXIT_ERROR}
 	fi
 
 	local reserved
 	for reserved in 0 4095; do
-		if [ "${TAG}" = "${reserved}" ]; then
-			error "TAG=${reserved} is reserved."
+		if [ "${ID}" = "${reserved}" ]; then
+			error "ID=${reserved} is reserved."
 			exit ${EXIT_ERROR}
 		fi
 	done
 }
 
 hook_find_port_name() {
+	assert isset ID
 	assert isset PARENT_PORT
-	assert isset TAG
 
-	print "${PARENT_PORT}${VLAN_PORT_INTERFIX}${TAG}"
+	print "${PARENT_PORT}${VLAN_PORT_INTERFIX}${ID}"
 }
 
 hook_parse_cmdline() {
@@ -70,6 +70,9 @@ hook_parse_cmdline() {
 					return ${EXIT_CONF_ERROR}
 				fi
 				;;
+			--id=*)
+				ID=$(cli_get_val "${1}")
+				;;
 			--port=*)
 				PARENT_PORT=$(cli_get_val "${1}")
 
@@ -79,9 +82,6 @@ hook_parse_cmdline() {
 					return ${EXIT_CONF_ERROR}
 				fi
 				;;
-			--tag=*)
-				TAG=$(cli_get_val "${1}")
-				;;
 			*)
 				error "Unknown argument '${1}'"
 				return ${EXIT_CONF_ERROR}
@@ -122,8 +122,8 @@ hook_create() {
 	# Create the VLAN device
 	if ! vlan_create "${port}" \
 			--address="${ADDRESS}" \
-			--parent="${PARENT_PORT}" \
-			--tag="${TAG}"; then
+			--id="${id}" \
+			--parent="${PARENT_PORT}"; then
 		error "Could not create port: ${port}"
 		return ${EXIT_ERROR}
 	fi