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

changeset 439:b5e45ecd4032

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename the recently added example scripts and integrate into the package build. They will be installed into the EXAMPLESDIR /usr/local/share/examples/local-bsdtools.
author Franz Glasner <fzglas.hg@dom66.de>
date Wed, 01 May 2024 23:07:59 +0200
parents 9c3b1966ba91
children 9c8ba2097a35
files Makefile pkg-plist share/examples/local-bsdtools/_ftjail-fbsd-update.sh share/examples/local-bsdtools/_ftjail-prep-fbsd-update.sh share/examples/local-bsdtools/freebsd-update-ftjail-template.sh share/examples/local-bsdtools/freebsd-update-ftjail.sh
diffstat 6 files changed, 83 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed May 01 21:35:43 2024 +0200
+++ b/Makefile	Wed May 01 23:07:59 2024 +0200
@@ -57,6 +57,10 @@
 	${CP} -v ${SRC}/${_ef} ${WRKSRC}/${_ef}
 	${SED} -i "" -e "s|@@SIMPLEVERSIONTAG@@|${SIMPLEVERSIONTAG}|" ${WRKSRC}/${_ef}
 .endfor
+	${MKDIR} ${WRKSRC}/share/examples/${PORTNAME}
+.for _sf in share/examples/local-bsdtools/freebsd-update-ftjail-template.sh share/examples/local-bsdtools/freebsd-update-ftjail.sh
+	${CP} -v ${SRC}/${_sf} ${WRKSRC}/${_sf}
+.endfor
 
 post-extract-DOCS-on:
 	${MKDIR} ${WRKSRC}/docs
@@ -84,6 +88,10 @@
 .for _ps in 800.local-ipv6-refresh 750.local-trim-zfs 720.local-triggered-action
 	${INSTALL_SCRIPT} ${WRKSRC}/etc/periodic/daily/${_ps} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 .endfor
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+.for _exf in freebsd-update-ftjail-template.sh freebsd-update-ftjail.sh
+	${INSTALL_DATA} ${WRKSRC}/share/examples/${PORTNAME}/${_exf} ${STAGEDIR}${EXAMPLESDIR}
+.endfor
 
 post-install-DOCS-on:
 .for _mp in ${MANPAGES5:R}
--- a/pkg-plist	Wed May 01 21:35:43 2024 +0200
+++ b/pkg-plist	Wed May 01 23:07:59 2024 +0200
@@ -8,6 +8,8 @@
 sbin/ftjail
 sbin/fpkg
 sbin/fzfs
+share/examples/local-bsdtools/freebsd-update-ftjail-template.sh
+share/examples/local-bsdtools/freebsd-update-ftjail.sh
 %%DOCS%%man/man5/bsmtp2dma.conf.5.gz
 %%DOCS%%man/man5/local-bsdtools-periodic.5.gz
 %%DOCS%%man/man5/package-mapping.conf.5.gz
--- a/share/examples/local-bsdtools/_ftjail-fbsd-update.sh	Wed May 01 21:35:43 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-set -u
-
-JAIL_NAME="${1:-}"
-
-if [ -z "${JAIL_NAME}" ]; then
-  echo "ERROR: No jail name given" 1>&2
-  exit 2
-fi
-
-
-
-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_ROOT="dpool/jail/TVAR"
-
-BASE_DIR="/jail/TROOT"
-
-case "${JAIL_NAME}" in
-  ftp)
-    zfs umount dpool/data/ftp/home-data
-    ;;
-  pg14)
-    zfs umount dpool/pg/walarchive-db1-pg14
-    zfs umount dpool/pg/data-db1-pg14
-    ;;
-  *)
-    ;;
-esac
-
-zfs snapshot -r "${SNAPSHOT_ROOT}/${JAIL_NAME}@${SNAPSHOT_NAME}"
-
-ftjail freebsd-update -o "${OLD_BASE_RO}" "${BASE_DIR}/${JAIL_NAME}" "${NEW_BASE_RO}" "${NEW_ETCUPDATE}"
-
-case "${JAIL_NAME}" in
-  ftp)
-    zfs mount dpool/data/ftp/home-data
-    ;;
-  pg14)
-    zfs mount dpool/pg/data-db1-pg14
-    zfs mount dpool/pg/walarchive-db1-pg14
-    ;;
-  *)
-    ;;
-esac
-
--- a/share/examples/local-bsdtools/_ftjail-prep-fbsd-update.sh	Wed May 01 21:35:43 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-set -u
-
-BASE_RO=dpool/jail/ttmpl/base-ro/13.2-RELEASE
-SKEL_RW=dpool/jail/ttmpl/skel-rw/13.2-RELEASE
-
-NEW_VER="p5"
-
-MOUNTPOINT="/var/tmp/13.2"
-
-ftjail mount-tmpl -P "$BASE_RO" "$SKEL_RW" "$MOUNTPOINT"
-
-freebsd-update -b "$MOUNTPOINT" fetch 
-freebsd-update -b "$MOUNTPOINT" install
-
-ftjail snapshot-tmpl "$BASE_RO" "$SKEL_RW" "$NEW_VER"
-
-ftjail build-etcupdate-current-tmpl "$MOUNTPOINT" /jail/RELEASE/etcupdate-current-13.2@${NEW_VER}.tbz
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/examples/local-bsdtools/freebsd-update-ftjail-template.sh	Wed May 01 23:07:59 2024 +0200
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+set -x
+set -u
+
+BASE_RO=dpool/jail/ttmpl/base-ro/13.2-RELEASE
+SKEL_RW=dpool/jail/ttmpl/skel-rw/13.2-RELEASE
+
+NEW_VER="p5"
+
+MOUNTPOINT="/var/tmp/13.2"
+
+ftjail mount-tmpl -P "$BASE_RO" "$SKEL_RW" "$MOUNTPOINT"
+
+freebsd-update -b "$MOUNTPOINT" fetch 
+freebsd-update -b "$MOUNTPOINT" install
+
+ftjail snapshot-tmpl "$BASE_RO" "$SKEL_RW" "$NEW_VER"
+
+ftjail build-etcupdate-current-tmpl "$MOUNTPOINT" /jail/RELEASE/etcupdate-current-13.2@${NEW_VER}.tbz
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/examples/local-bsdtools/freebsd-update-ftjail.sh	Wed May 01 23:07:59 2024 +0200
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+set -e
+set -x
+set -u
+
+JAIL_NAME="${1:-}"
+
+if [ -z "${JAIL_NAME}" ]; then
+  echo "ERROR: No jail name given" 1>&2
+  exit 2
+fi
+
+
+
+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_ROOT="dpool/jail/TVAR"
+
+BASE_DIR="/jail/TROOT"
+
+case "${JAIL_NAME}" in
+  ftp)
+    zfs umount dpool/data/ftp/home-data
+    ;;
+  pg14)
+    zfs umount dpool/pg/walarchive-db1-pg14
+    zfs umount dpool/pg/data-db1-pg14
+    ;;
+  *)
+    ;;
+esac
+
+zfs snapshot -r "${SNAPSHOT_ROOT}/${JAIL_NAME}@${SNAPSHOT_NAME}"
+
+ftjail freebsd-update -o "${OLD_BASE_RO}" "${BASE_DIR}/${JAIL_NAME}" "${NEW_BASE_RO}" "${NEW_ETCUPDATE}"
+
+case "${JAIL_NAME}" in
+  ftp)
+    zfs mount dpool/data/ftp/home-data
+    ;;
+  pg14)
+    zfs mount dpool/pg/data-db1-pg14
+    zfs mount dpool/pg/walarchive-db1-pg14
+    ;;
+  *)
+    ;;
+esac
+