[SCRIPTS] Fast forward

FreeBSD/storage/zfs-dataset-backup.bash

@@ -26,7 +26,10 @@ openssl enc -aes-256-ctr -a -pbkdf2 -iter 1000 -salt -k $enc_password \
 > $backup_location/$dataset_name-$backup_date.pigz.enc
 
 ## delete snapshot
+<<<<<<< HEAD
 #sleep 1
+=======
+>>>>>>> 93e0bfb4f86673a87465d127972c447d7c48cfc0
 zfs destroy $dataset_orig@$backup_date
 
 # report done

FreeBSD/vm/vcreate.csh

@@ -16,6 +16,10 @@ set IMAGE=ubuntu20.img
 set PUBKEY=/home/simon/.ssh/id_ed25519.pub
 set NAMESERVER=192.168.10.254
 set GATEWAY=192.168.10.254
+<<<<<<< HEAD
+=======
+set PREFIX=24
+>>>>>>> 93e0bfb4f86673a87465d127972c447d7c48cfc0
 
 # create vm
 $VM create \
@@ -23,5 +27,9 @@ $VM create \
   -s $SIZE \
   -i $IMAGE \
   -C -k $PUBKEY \
+<<<<<<< HEAD
   -n "ip=$IP/24;gateway=$GATEWAY;nameservers=$NAMESERVER" \
+=======
+  -n "ip=$IP/$PREFIX;gateway=$GATEWAY;nameservers=$NAMESERVER" \
+>>>>>>> 93e0bfb4f86673a87465d127972c447d7c48cfc0
   $HOSTNAME