create,clone: add -S option to specify a different network stack

    network: add _get_pot_network_stack, to allow per-pot stack option
    network: netowrw_stack is now a parameter
    start: adopt the per-pot stack option
    network-stack: option wider adoption
    zsh: adjust autocompletion
    test: network1 fixed and extended
    tests: fix tests

Author: pizzamig

share/pot/clone.sh

@@ -12,6 +12,7 @@ clone-help()
 	echo '  -N network-type : new network type of the cloned pot'
 	echo '  -i ipaddr : an ip address or the keyword auto (if applicable)'
 	echo '  -B bridge-name : the name of the bridge to be used (private-bridge only)'
+	echo '  -S network-stack : the network stack (ipv4, ipv6 or dual)'
 	echo '  -F : automatically take snapshots of dataset that has no one'
 }
 
@@ -155,15 +156,17 @@ _cj_zfs()
 # $3 network type
 # $4 ip
 # $5 bridge name
+# $6 network stack
 _cj_conf()
 {
 	# shellcheck disable=SC2039
-	local _pname _potbase _ptype _ip _network_type _bridge_name
+	local _pname _potbase _ptype _ip _network_type _bridge_name _stack
 	_pname=$1
 	_potbase=$2
 	_network_type=$3
 	_ip=$4
 	_bridge_name=$5
+	_stack=$6
 	_pdir=${POT_FS_ROOT}/jails/$_pname
 	_pbdir=${POT_FS_ROOT}/jails/$_potbase
 	if [ ! -d "$_pdir/conf" ]; then
@@ -172,6 +175,7 @@ _cj_conf()
 	grep -v ^host.hostname "$_pbdir/conf/pot.conf" | \
 		grep -v ^ip | grep -v ^vnet | grep -v ^network_type > "$_pdir/conf/pot.conf"
 	echo "host.hostname=\"${_pname}.$( hostname )\"" >> "$_pdir/conf/pot.conf"
+	echo "pot.stack=$_stack" >> "$_pdir/conf/pot.conf"
 	echo "network_type=$_network_type" >> "$_pdir/conf/pot.conf"
 	case "$_network_type" in
 	"inherit")
@@ -218,15 +222,16 @@ _cj_conf()
 # shellcheck disable=SC2039
 pot-clone()
 {
-	local _pname _ipaddr _potbase _pblvl _autosnap _pb_type _pb_network_type _network_type _bridge_name
+	local _pname _ipaddr _potbase _pblvl _autosnap _pb_type _pb_network_type _network_type _bridge_name _network_stack
 	_pname=
 	_ipaddr=
 	_potbase=
 	_pblvl=0
 	_autosnap="NO"
 	_bridge_name=
+	_network_stack=
 	OPTIND=1
-	while getopts "hvp:i:P:FN:B:" _o ; do
+	while getopts "hvp:i:P:FN:B:S:" _o ; do
 		case "$_o" in
 			h)
 				clone-help
@@ -259,6 +264,14 @@ pot-clone()
 			B)
 				_bridge_name=$OPTARG
 				;;
+			S)
+				if ! is_in_list "$OPTARG" "ipv4" "ipv6" "dual" ; then
+					_error "Network stack $OPTARG not valid"
+					create-help
+					${EXIT} 1
+				fi
+				_network_stack="$OPTARG"
+				;;
 			F)
 				_autosnap="YES"
 				;;
@@ -298,7 +311,10 @@ pot-clone()
 		fi
 		_network_type="$_pb_network_type"
 	fi
-	if ! _ipaddr="$( _validate_network_param "$_network_type" "$_ipaddr" "$_bridge_name" )" ; then
+	if [ -z "$_network_stack" ]; then
+		_network_stack="$( _get_pot_network_stack "$_potbase" )"
+	fi
+	if ! _ipaddr="$( _validate_network_param "$_network_type" "$_ipaddr" "$_bridge_name" "$_network_stack" )" ; then
 		echo "$_ipaddr"
 		clone-help
 		${EXIT} 1
@@ -316,7 +332,7 @@ pot-clone()
 	if ! _cj_zfs "$_pname" "$_potbase" $_autosnap ; then
 		${EXIT} 1
 	fi
-	if ! _cj_conf "$_pname" "$_potbase" "$_network_type" "$_ipaddr" "$_bridge_name" ; then
+	if ! _cj_conf "$_pname" "$_potbase" "$_network_type" "$_ipaddr" "$_bridge_name" "$_network_stack" ; then
 		${EXIT} 1
 	fi
 }

share/pot/create.sh

@@ -30,6 +30,7 @@ create-help()
 	echo '         auto: usable with public-bridge and private-bridge (default)'
 	echo '         ipaddr: mandatory with alias, usable with public-bridge and private-bridge'
 	echo '  -B bridge-name : the name of the bridge to be used (private-bridge only)'
+	echo '  -S network-stack : the network stack (ipv4, ipv6 or dual)'
 }
 
 _cj_undo_create()
@@ -221,12 +222,13 @@ _cj_zfs()
 # $7 type
 # $8 private bridge (if network tpye is private_bridge"
 # $9 pot-base name
+# $10 network-stack
 _cj_conf()
 {
 	# shellcheck disable=SC2039
 	local _pname _base _ip _network_type _lvl _jdir _bdir _potbase _dns _type _pblvl _pbpb
 	# shellcheck disable=SC2039
-	local _jdset _bdset _pbdset _baseos _bridge_name
+	local _jdset _bdset _pbdset _baseos _bridge_name _stack
 	_pname=$1
 	_base=$2
 	_network_type=$3
@@ -236,6 +238,8 @@ _cj_conf()
 	_type=$7
 	_bridge_name=$8
 	_potbase=$9
+	_stack=${10}
+
 	_jdir=${POT_FS_ROOT}/jails/$_pname
 	_bdir=${POT_FS_ROOT}/bases/$_base
 
@@ -301,6 +305,7 @@ _cj_conf()
 		echo "pot.attr.start-at-boot=NO"
 		echo "pot.attr.procfs=NO"
 		echo "pot.attr.prunable=NO"
+		echo "pot.stack=$_stack"
 		echo "network_type=$_network_type"
 		case $_network_type in
 		"inherit")
@@ -347,6 +352,7 @@ _cj_conf()
 # $4 ip
 _cj_internal_conf()
 {
+	# shellcheck disable=SC2039
 	local _pname _type _lvl _ip _jdir
 	_pname=$1
 	_type=$2
@@ -489,7 +495,7 @@ _cj_single_install()
 pot-create()
 {
 	# shellcheck disable=SC2039
-	local _pname _ipaddr _lvl _base _flv _potbase _dns _type _new_lvl _network_type _private_bridge
+	local _pname _ipaddr _lvl _base _flv _potbase _dns _type _new_lvl _network_type _private_bridge _network_stack
 	OPTIND=1
 	_type="multi"
 	_network_type="inherit"
@@ -502,8 +508,9 @@ pot-create()
 	_potbase=
 	_dns=inherit
 	_private_bridge=
+	_network_stack="$( _get_network_stack )"
 	_cleanup_keep="NO"
-	while getopts "hvp:t:N:i:l:b:f:P:d:B:k" _o ; do
+	while getopts "hvp:t:N:i:l:b:f:P:d:B:S:k" _o ; do
 		case "$_o" in
 		h)
 			create-help
@@ -538,6 +545,14 @@ pot-create()
 		B)
 			_private_bridge="$OPTARG"
 			;;
+		S)
+			if ! _is_in_list "$OPTARG" "ipv4" "ipv6" "dual" ; then
+				_error "Network stack $OPTARG not valid"
+				create-help
+				${EXIT} 1
+			fi
+			_network_stack="$OPTARG"
+			;;
 		i)
 			if [ -z "$_ipaddr" ]; then
 				_ipaddr="$OPTARG"
@@ -745,7 +760,7 @@ pot-create()
 	if ! _is_uid0 ; then
 		${EXIT} 1
 	fi
-	if ! _ipaddr="$( _validate_network_param "$_network_type" "$_ipaddr" "$_private_bridge" )" ; then
+	if ! _ipaddr="$( _validate_network_param "$_network_type" "$_ipaddr" "$_private_bridge" "$_network_stack" )" ; then
 		echo "$_ipaddr"
 		${EXIT} 1
 	fi
@@ -760,22 +775,23 @@ pot-create()
 		fi
 	fi
 	_info "Creating a new pot"
-	_info "pot name    : $_pname"
-	_info "type        : $_type"
-	_info "base        : $_base"
-	_info "pot_base    : $_potbase"
-	_info "level       : $_lvl"
-	_info "network-type: $_network_type"
-	_info "ip          : $_ipaddr"
-	_info "bridge      : $_private_bridge"
-	_info "dns         : $_dns"
-	_info "flavours    : $_flv"
+	_info "pot name     : $_pname"
+	_info "type         : $_type"
+	_info "base         : $_base"
+	_info "pot_base     : $_potbase"
+	_info "level        : $_lvl"
+	_info "network-type : $_network_type"
+	_info "network-stack: $_network_stack"
+	_info "ip           : $_ipaddr"
+	_info "bridge       : $_private_bridge"
+	_info "dns          : $_dns"
+	_info "flavours     : $_flv"
 	export _cleanup_pname="$_pname" # for the cleanup function
 	export _cleanup_keep
 	if ! _cj_zfs "$_pname" "$_type" "$_lvl" "$_base" "$_potbase" ; then
 		${EXIT} 1
 	fi
-	if ! _cj_conf "$_pname" "$_base" "$_network_type" "$_ipaddr" "$_lvl" "$_dns" "$_type" "$_private_bridge" "$_potbase" ; then
+	if ! _cj_conf "$_pname" "$_base" "$_network_type" "$_ipaddr" "$_lvl" "$_dns" "$_type" "$_private_bridge" "$_potbase" "$_network_stack" ; then
 		${EXIT} 1
 	fi
 	if [ "$_type" = "single" ]; then

share/pot/export-ports.sh

@@ -86,7 +86,7 @@ pot-export-ports()
 		[ "$(_get_pot_network_type "$_pname")" != "private-bridge" ] ; then
 		_info "Only public-bridge and private-bridge network type can export ports - this setting will be ignored during start"
 	fi
-	if [ "$( _get_network_stack )" = "ipv6" ]; then
+	if [ "$( _get_pot_network_stack "$_pname" )" = "ipv6" ]; then
 		_info "Only ipv4 can export ports, on ipv6 the pot has already a unique address - this setting will be ignored during start"
 	fi
 	_debug "Exporting the following ports: $_ports"

share/pot/info.sh

@@ -17,19 +17,14 @@ info-help()
 _info_pot_env()
 {
 	# shellcheck disable=SC2039
-	local _pname _ips _idx
+	local _pname _ips _idx _all_ips
 	_pname=$1
 	echo "export _POT_NAME=$_pname"
 	if [ "$( _get_pot_network_type "$_pname" )" != "alias" ]; then
 		echo "export _POT_IP=$( _get_ip_var "$_pname" )"
 	else
-		_ips=""
-		if [ "$( _get_network_stack )" != "ipv6" ]; then
-			_ips="$( _get_alias_ipv4 "$_pname" )"
-		fi
-		if [ "$( _get_network_stack )" != "ipv4" ]; then
-			_ips="$_ips $( _get_alias_ipv6 "$_pname" )"
-		fi
+		_all_ips="$( _get_ip_var "$_pname" ) "
+		_ips="$( _get_alias_ipv4 "$_pname" "$_all_ips" ) $( _get_alias_ipv6 "$_pname" "$_all_ips" )"
 		_idx=0
 		_ipvar_list=""
 		_nicvar_list=""