Mercurial > hgrepos > FreeBSD > ports > sysutils > local-bsdtools

changeset 670:035c5467a0d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Examples: make them a little more generic
author Franz Glasner <fzglas.hg@dom66.de>
date Mon, 30 Sep 2024 11:51:17 +0200
parents fc2daa2dfe5f
children d5ea9275de32
files share/examples/local-bsdtools/freebsd-update-ftjail-template.sh share/examples/local-bsdtools/freebsd-update-ftjail.sh
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/share/examples/local-bsdtools/freebsd-update-ftjail-template.sh	Mon Sep 30 11:36:09 2024 +0200
+++ b/share/examples/local-bsdtools/freebsd-update-ftjail-template.sh	Mon Sep 30 11:51:17 2024 +0200
@@ -4,10 +4,12 @@
 set -x
 set -u
 
-RELEASE="13.2"
-NEW_VER="p5"
+: ${RELEASE:="13.2"}
+: ${NEW_VER:="p5"}
+
 BASE_RO="dpool/jail/ttmpl/base-ro/${RELEASE}-RELEASE"
 SKEL_RW="dpool/jail/ttmpl/skel-rw/${RELEASE}-RELEASE"
+NEW_ETCUPDATE_CURRENT="/jail/RELEASE/etcupdate-current-${RELEASE}@${NEW_VER}.tbz"
 
 MOUNTPOINT="/var/tmp/${RELEASE}"
 
@@ -18,6 +20,6 @@
 
 ftjail snapshot-tmpl "$BASE_RO" "$SKEL_RW" "$NEW_VER"
 
-ftjail build-etcupdate-current-tmpl "$MOUNTPOINT" "/jail/RELEASE/etcupdate-current-${RELEASE}@${NEW_VER}.tbz"
+ftjail build-etcupdate-current-tmpl "$MOUNTPOINT" "${NEW_ETCUPDATE_CURRENT}"
 
 ftjail umount-tmpl -P "$BASE_RO" "$SKEL_RW"
--- a/share/examples/local-bsdtools/freebsd-update-ftjail.sh	Mon Sep 30 11:36:09 2024 +0200
+++ b/share/examples/local-bsdtools/freebsd-update-ftjail.sh	Mon Sep 30 11:51:17 2024 +0200
@@ -4,6 +4,7 @@
 set -x
 set -u
 
+# Set CHECK_ONLY to a non-null value to just call ftjail check-freebsd-update
 : ${CHECK_ONLY=""}
 
 JAIL_NAME="${1:-}"
@@ -18,8 +19,8 @@
 OLD_BASE_RO="dpool/jail/ttmpl/base-ro/13.2-RELEASE@p5"
 NEW_BASE_RO="dpool/jail/ttmpl/base-ro/13.2-RELEASE@p9"
 NEW_ETCUPDATE="/jail/RELEASE/etcupdate-current-13.2@p9.tbz"
+SNAPSHOT_NAME="13.2-p5-20240108-1"
 
-SNAPSHOT_NAME="13.2-p5-20240108-1"
 SNAPSHOT_ROOT="dpool/jail/TVAR"
 
 BASE_DIR="/jail/TROOT"
@@ -40,7 +41,7 @@
     ;;
 esac
 
-# Is now requested with option -R
+# Snapshotting is now integrated (and checked) in "ftjail freebsd-upate"
 #   zfs snapshot -r "${SNAPSHOT_ROOT}/${JAIL_NAME}@${SNAPSHOT_NAME}"
 
 ftjail freebsd-update -R "${SNAPSHOT_ROOT}/${JAIL_NAME}@${SNAPSHOT_NAME}" -o "${OLD_BASE_RO}" "${BASE_DIR}/${JAIL_NAME}" "${NEW_BASE_RO}" "${NEW_ETCUPDATE}"
@@ -56,4 +57,3 @@
   *)
     ;;
 esac
-