mount-in: new command, generic replacement for add-fscomp

    Add function _is_fscomp
    mount-in: add initial implementation
    Add a stub for _is_fscomp
    Add tests and fixes
    Add zsh autocompletion
    Add mount-in to the available command list
    Mark add-fscomp as deprecated
    Add copy-in and mount-in as flavourable commands

Author: pizzamig

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - execute: an orchestration oriented command that imports and automatically set several settings on a pot
 - prepare: new command, taking the place of execute
 - copy-in: new command, to copy files or directory inside a pot (generalized replacement of add-file)
+- mount-in: new command, to mount a directory, a zfs dataset or a fscomp inside a pot (replacement for add-fscomp)
 
 ### Changed
 - export-ports: removed -S for static port export
@@ -18,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Deprecated
 - add-file: deprecated, replaced by the more general new copy-in command
+- add-fscomp: deprecated, replaces by the more general new mount-in command
 
 ## [0.6.1] 2019-06-25
 ### Fixed

bin/pot

@@ -91,6 +91,7 @@ Commands:
 	rename -- Rename a pot
 	destroy -- Destroy a pot
 	copy-in -- Copy a file or a directory into a pot
+	mount-in -- Mount a directory, a zfs dataset or a fscomp into a pot
 	add-file -- Add a file to a pot
 	add-fscomp -- Add a fs component or a directory to a pot
 	add-dep -- Add a dependency
@@ -159,7 +160,7 @@ case "${CMD}" in
 	list|info|ps|top|\
 	init|de-init|vnet-start|\
 	create-base|create-fscomp|create|create-dns|\
-	copy-in|\
+	copy-in|mount-in|\
 	add-file|add-fscomp|destroy|add-dep|set-rss|set-cmd|\
 	export|import|prepare|\
 	export-ports|set-attribute|get-attribute|\

share/pot/add-fscomp.sh

@@ -192,6 +192,12 @@ pot-add-fscomp()
 		esac
 	done
 
+	echo '###############################'
+	echo '#   add-fscomp is deprecated  #'
+	echo '###############################'
+	echo '# Please use mount-in instead #'
+	echo '###############################'
+
 	if [ -z "$_pname" ]; then
 		_error "A pot name is mandatory"
 		add-fscomp-help

share/pot/common.sh

@@ -380,6 +380,26 @@ _is_vnet_up()
 	fi
 }
 
+# $1 fscomp name
+# $2 quiet / no _error messages are emitted (sometimes usefult)
+# tested
+_is_fscomp()
+{
+	local _fscomp _fdir _fdset
+	_fscomp="$1"
+	_fdir="${POT_FS_ROOT}/fscomp/$_fscomp"
+	_fdset="${POT_ZFS_ROOT}/fscomp/$_fscomp"
+	if [ ! -d "$_fdir" ]; then
+		_qerror "$2" "fscomp $_fscomp not found"
+		return 1
+	fi
+	if ! _zfs_dataset_valid "$_fdset" ; then
+		_qerror "$2" "dataset $_fdset for fscomp $_fscomp not found"
+		return 2
+	fi
+	return 0
+}
+
 # $1 base name
 # $2 quiet / no _error messages are emitted (sometimes usefult)
 # tested
@@ -556,6 +576,7 @@ _is_cmd_flavorable()
 	_cmd=$1
 	case $_cmd in
 		add-dep|add-fscomp|set-attribute|\
+		copy-in|mount-in|\
 		set-rss|export-ports)
 			return 0
 			;;