.

jails/config/vm/cvm-b.sh

@@ -16,7 +16,7 @@ bhyvectl --destroy --vm=cvm-b
 while true
 do
 
-bhyve -c 4 -m 16G -A -H -P \
+bhyve -c 8 -m 32G -A -H -P \
 -s 0,hostbridge \
 -s 3,ahci-cd \
 -s 4,virtio-blk,/dev/zvol/ship/raw/cvm-b \

jails/config/vm/freebsd.sh

@@ -19,8 +19,13 @@ do
 bhyve -c 2 -m 4G -A -H -P \
 -s 0,hostbridge \
 -s 3,ahci-cd \
--s 4,virtio-blk,/dev/zvol/ship/raw/freebsd \
--s 5,virtio-net,tap83,mac=00:0A:0B:0C:0D:83 \
+-s 4,virtio-blk,/dev/zvol/ship/raw/freebsd_1 \
+-s 5,virtio-blk,/dev/zvol/ship/raw/freebsd_2 \
+-s 6,virtio-blk,/dev/zvol/ship/raw/freebsd_z1 \
+-s 7,virtio-blk,/dev/zvol/ship/raw/freebsd_z2 \
+-s 8,virtio-blk,/dev/zvol/ship/raw/freebsd_z3 \
+-s 9,virtio-blk,/dev/zvol/ship/raw/freebsd \
+-s 10,virtio-net,tap83,mac=00:0A:0B:0C:0D:83 \
 -s 29,fbuf,tcp=0.0.0.0:5983,w=1600,h=900 \
 -s 30,xhci,tablet \
 -s 31,lpc -l com1,/dev/nmdm83A \
@@ -47,7 +52,7 @@ done
 exit $?
 
 #-s 3,ahci-cd \
-#-s 3,ahci-cd,/mnt/freebsd/FreeBSD-12.1-RELEASE-amd64-disc1.iso \
+#-s 3,ahci-cd,/mnt/freebsd/FreeBSD-12.2-RELEASE-amd64-disc1.iso \
 # set boot_serial=NO
 # first in boot menu option 3 and then /boot/loader.conf after install
 
@@ -58,8 +63,17 @@ exit $?
 
 #on base system:
 #zfs create -V 32G -o refreservation=none ship/raw/freebsd
+#zfs create -V 16G -o refreservation=none ship/raw/freebsd_1
+#zfs create -V 16G -o refreservation=none ship/raw/freebsd_2
+#zfs create -V 16G -o refreservation=none ship/raw/freebsd_z1
+#zfs create -V 16G -o refreservation=none ship/raw/freebsd_z2
+#zfs create -V 16G -o refreservation=none ship/raw/freebsd_z3
 # on boot
 #ifconfig tap83 create
 #ifconfig bridge1 addm tap83 up
 #ifconfig tap83 up
 #ifconfig tap83 inet6 auto_linklocal
+#
+#zroot mirror /dev/vtbd1 /dev/vtbd2 - created during zroot install
+#zpool create -f ship /dev/vtbd2 /dev/vtbd3 /dev/vtbd4
+#zpool create -f data /dev/vtbd5

jails/update.sh

@@ -37,8 +37,9 @@ update_jail ()
     # iocage exec $JAIL "pkg upgrade -f -y"
     iocage exec $JAIL "pkg clean -ay"
 
-    iocage exec $JAIL "rm -rf /var/tmp/temproot*"
-    iocage exec $JAIL "mergemaster -a"
+#    iocage exec $JAIL "rm -rf /var/tmp/temproot*"
+#    iocage exec $JAIL "mergemaster -a"
+    iocage exec $JAIL "etcupdate -t /mnt/common/current-src.bzip2"
 
     iocage exec $JAIL "freebsd-version"
 
@@ -48,10 +49,8 @@ update_jail ()
 
 iocage fetch -U -r 12.2-RELEASE
 
-read -p "update pkgp jail (y/N)? " RESP
+read -p "update pkgp packages first (y/N)? " RESP
 if [ ! -z $RESP ] && [ $RESP == "y" ]; then
-    JAIL="pkgp"
-    update_jail
     /root/FreeBSD/jails/jails-update-pkgs.sh pkgp-only
 fi
 
@@ -60,11 +59,11 @@ if [ ! -z $RESP ] && [ $RESP == "y" ]; then
 #    for JAIL in `iocage list -h | cut -f2`;
     for JAIL in `jls -N | cut -d " " -f 2 | cut -d "-" -f 2- | grep -v JID | sort`;
     do
-        if [ $JAIL == "pkgp" ] || [ $JAIL == "debian" ]; then
+        if [ $JAIL == "test" ] || [ $JAIL == "debian" ]; then
             continue
         fi
         if [[ $1 == "upgrade" ]]; then
-            read -p "update jail $JAIL (Y/n)? " RESP
+            read -p "upgrade jail $JAIL (Y/n)? " RESP
             if [ ! -z $RESP ] && [ $RESP == "n" ]; then
                 continue
             fi
@@ -75,10 +74,15 @@ fi
 
 echo "update base system by running:"
 echo "freebsd-update fetch"
+# echo "freebsd-update upgrade -r 13.0-RELEASE"
 echo "freebsd-update install"
+# echo "pkg bootstrap -f ; pkg update ; pkg upgrade"
 echo "cd /usr/src; svn update; make -j8 buildkernel KERNCONF=diyIT && make -j8 installkernel KERNCONF=diyIT"
+echo "etcupdate build /root/FreeBSD/jails/configs/common/current-src.bzip2"
 echo "reboot"
 echo "pkg-static upgrade -f"
-echo "mergemaster"
+#echo "rm -rf /var/tmp/temproot*"
+#echo "mergemaster -a"
+echo "etcupdate -t /mnt/common/current-src.bzip2"
 
 echo "/root/FreeBSD/scripts/zfs-prune-snapshots -vn -p 'ioc_update' 1d | grep removing"