various fixes:

- enhanced port installation
- added jail.conf variable ports=YYYYMMDD
- fixed build and install bugs
- exit on mount error
- check existence of src+dst before mounting
- only remove stuff in a new base in non-ports mode (!rw)
- fixed fetch runner

README.md

@@ -146,10 +146,16 @@ Then install the build jail as usual:
 
 `jaildk build myjail`
 
-Finally, install the current ports collection:
+Install the current ports collection:
 
 `jaildk fetch`
 
+In case the  ports version created does not match  the version of your
+jail, you need  to configure the different ports version  in your jail
+config `/jail/etc/myjail/jail.conf` like this:
+
+`ports=20201127`
+
 Now you can enter the build jail and install ports the traditional way:
 
 ```

jaildk

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -Cf
+
 version=1.05
 
 usage_jaildk() {
@@ -48,7 +50,7 @@ ex() {
 }
 
 err () {
-   echo "$@" #>&2
+   echo "$@" >&2
 }
 
 bold() {
@@ -103,7 +105,7 @@ jaildk_build() {
     fi
 
     if test -n "buildbase"; then
-        base="$j/$buildbase"
+        base="$buildbase"
     elif test -z "$base"; then
         # not configured, use default: latest
         base=`ls $j/base | tail -1`
@@ -123,6 +125,10 @@ jaildk_rc_ports() {
 
     load-jail-config $jail
 
+    if test -n "$ports"; then
+        version="$ports"
+    fi
+
     if test -n "$buildbase" -a -n "$rw"; then
         # we only support ports if a buildbase is configured
         case $mode in
@@ -218,6 +224,15 @@ jaildk_rc_mount() {
                             if echo $src | egrep -q "^/"; then
                               source=$src
                             fi
+
+                            if ! test -d "$source"; then
+                                die "Source dir $source doesn't exist!"
+                            fi
+
+                            if ! test -d "$run/$dest"; then
+                                die "Dest dir $run/$dest doesn't exist!"
+                            fi
+
                             ex mount -t $fs -o $opts $source $run/$dest
                             ;;
                         devfs)
@@ -315,7 +330,7 @@ jaildk_install() {
     esac
 
     for rcscript in $rcscripts; do
-        $rcscript $jail $mode $rw $base $version
+        $rcscript $jail $mode $rw $base $version || exit 1
     done
 }
 
@@ -421,18 +436,32 @@ boot"
         exit 1
     else
         ex mkdir -p $basedir
-        DISTRIBUTIONS="base.txz" bsdinstall jail $basedir
+        bsdinstall jail $basedir
 
-        if test -n "$rw"; then
+        if test -z "$rw"; then
+            # run base
             for file in $removelist; do
                 ex rm -rf $basedir/$file
             done
-
+        else
+            # build base with ports support
             ex mkdir -p $basedir/usr/ports
         fi
 
+        ex mkdir $basedir/home
         ex rm -rf $basedir/var/db
         ex ln -s /usr/local/db $basedir/var/db
+
+        if test -n "$rw"; then
+            echo "You have choosen to create a build base with ports support"
+            echo -n "Want to fetch the ports collection now [Yn]? "
+            read yesno
+            case $yesno in
+                y|Y|yes|YES)
+                    jaildk_fetch
+                    ;;
+            esac
+        fi
     fi
 }
 
@@ -939,30 +968,28 @@ endif
     esac
 }
 
-jaildk_fetch_ports() {
+jaildk_fetch() {
     version=`date +%Y%m%d`
-    if [ -d "$j/ports/$version" ]; then
+    if test -d "$j/ports/$version"; then
-        echo "Ports dir $version already exist. Do you want to recreate it? [y/N]"
+        echo -n "Ports dir $version already exist. Do you want to recreate it [y/N]? "
         read yesno
         case $yesno in
             y|Y|yes|YES)
-                rm -rf $j/ports/$version
+                ex rm -rf $j/ports/$version
-                jaildk_fetch_ports_exec
+                jaildk_fetch_ports
                 ;;
         esac
     else
-        jaildk_fetch_exec
+        jaildk_fetch_ports
     fi
 }
 
-jaildk_fetch_ports_exec() {
+jaildk_fetch_ports() {
-    fetch -o $j/ports/$version.tar.gz http://ftp.freebsd.org/pub/FreeBSD/ports/ports/ports.tar.gz
+    ex mkdir -p $j/ports/tmp
-    mkdir -p $j/ports/$version
+    ex fetch -o $j/ports/tmp/ports.tar.gz http://ftp.freebsd.org/pub/FreeBSD/ports/ports/ports.tar.gz
-    tar xzfC $j/ports/$version.tar.gz $j/ports/$version
+    ex tar xzfC $j/ports/tmp/ports.tar.gz $j/ports/tmp/
-    cd $j/ports/$version/
+    ex mv $j/ports/tmp/ports $j/ports/$version
-    mv ports/* .
+    ex rm -rf $j/ports/tmp/ports*
-    cd -
-    rm -rf $j/ports/$version.tar.gz  $j/ports/$version/ports
 }
 
 ##########################
@@ -982,6 +1009,10 @@ rcdir=$j/bin
 runner=$1
 shift
 
+if test -z "$runner"; then
+    usage_jaildk
+fi
+
 case $runner in
     start|stop|status|restart)
         jaildk_jail $runner $*