clone: fix pot.stack parameter

    prepare: add -S option to specify the stack
    prepare: convert -S flag to -s (automatically start the pot when ready)
    clone: fix bridge parameter as well

Author: pizzamig

CHANGELOG.md

@@ -5,8 +5,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- prepare: the -S option is now used to specify the network stack
+
+### Changed
+- prepare: the -S flag to start the imported pot changed in -s
+
 ### Fixed
-- fbsd-update: don't assume there is a tty
+- fbsd-update: don't assume there is a tty (#86)
+- clone: duplicate the entry pot.stack (#88)
 
 ## [0.11.1] 2020-04-19
 ### Fixed

share/pot/clone.sh

@@ -172,8 +172,8 @@ _cj_conf()
 	if [ ! -d "$_pdir/conf" ]; then
 		mkdir -p "$_pdir/conf"
 	fi
-	grep -v ^host.hostname "$_pbdir/conf/pot.conf" | \
-		grep -v ^ip | grep -v ^vnet | grep -v ^network_type > "$_pdir/conf/pot.conf"
+	grep -v ^host.hostname "$_pbdir/conf/pot.conf" | grep -v ^bridge \
+		grep -v ^ip | grep -v ^vnet | grep -v ^network_type | grep -v ^pot.stack > "$_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"
@@ -265,7 +265,7 @@ pot-clone()
 				_bridge_name=$OPTARG
 				;;
 			S)
-				if ! is_in_list "$OPTARG" "ipv4" "ipv6" "dual" ; then
+				if ! _is_in_list "$OPTARG" "ipv4" "ipv6" "dual" ; then
 					_error "Network stack $OPTARG not valid"
 					create-help
 					${EXIT} 1

share/pot/prepare.sh

@@ -18,8 +18,9 @@ prepare-help()
 	echo '  -i ipaddr : an ip address or the keyword auto (if applicable)'
 	echo '  -e port : the tcp port'
 	echo '            This option can be repeated multiple time, to export more ports'
-	echo '  -S : start immediately the newly generated pot'
 	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 '  -s : start immediately the newly generated pot'
 }
 
 pot-prepare()
@@ -34,7 +35,7 @@ pot-prepare()
 	_bridge_name=
 	_cmd=
 	OPTIND=1
-	while getopts "hvp:U:t:c:e:a:n:SN:i:B:" _o ; do
+	while getopts "hvp:U:t:c:e:a:n:sN:i:B:S:" _o ; do
 		case "$_o" in
 		h)
 			prepare-help
@@ -73,7 +74,7 @@ pot-prepare()
 				_ports="$_ports $OPTARG"
 			fi
 			;;
-		S)
+		s)
 			_auto_start="YES"
 			;;
 		N)
@@ -95,6 +96,15 @@ pot-prepare()
 		i)
 			_ipaddr=$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"
+			;;
+
 		*)
 			prepare-help
 			${EXIT} 1
@@ -157,6 +167,9 @@ pot-prepare()
 	if [ -n "$_ipaddr" ]; then
 		_clone_network_opt="$_clone_network_opt -i $_ipaddr"
 	fi
+	if [ -n "$_network_stack" ]; then
+		_clone_network_opt="$_clone_network_opt -S $_network_stack"
+	fi
 	# shellcheck disable=SC2086
 	if ! pot-cmd clone -P "${_imported_pname}" -p "${_new_pname}" $_clone_network_opt ; then
 		_error "Not able to clone imported pot as $_new_pname"