Index: head/sysutils/freebsd-snapshot/Makefile =================================================================== --- head/sysutils/freebsd-snapshot/Makefile (revision 493932) +++ head/sysutils/freebsd-snapshot/Makefile (revision 493933) @@ -1,36 +1,36 @@ # Created by: gtodd@bellanet.org # $FreeBSD$ PORTNAME= freebsd-snapshot DISTVERSION= 20091208.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://people.freebsd.org/~rse/dist/ MAINTAINER= gtodd@bellanet.org COMMENT= Convenience frontend tools for the management of UFS2 snapshots LICENSE= BSD2CLAUSE NO_BUILD= yes NO_ARCH= yes SUB_FILES= pkg-message pkg-deinstall PLIST_FILES= etc/amd.map.snap man/man8/periodic-snapshot.8.gz \ man/man8/snapshot.8.gz sbin/periodic-snapshot sbin/snapshot post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ ${WRKSRC}/amd.map.snap ${WRKSRC}/snapshot \ ${WRKSRC}/periodic-snapshot ${WRKSRC}/snapshot.8 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/snapshot ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/periodic-snapshot ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/snapshot.8 ${STAGEDIR}${MANPREFIX}/man/man8 ${INSTALL_MAN} ${WRKSRC}/periodic-snapshot.8 \ ${STAGEDIR}${MANPREFIX}/man/man8 ${INSTALL_DATA} ${WRKSRC}/amd.map.snap ${STAGEDIR}${PREFIX}/etc .include Index: head/sysutils/freebsd-snapshot/files/patch-allow-unlimited-snapshots-on-zfs =================================================================== --- head/sysutils/freebsd-snapshot/files/patch-allow-unlimited-snapshots-on-zfs (nonexistent) +++ head/sysutils/freebsd-snapshot/files/patch-allow-unlimited-snapshots-on-zfs (revision 493933) @@ -0,0 +1,45 @@ +PR: 215828 +--- periodic-snapshot.2016122900 2016-12-29 10:31:43.423980000 -0500 ++++ periodic-snapshot 2017-01-05 11:21:16.767572000 -0500 +@@ -47,6 +47,22 @@ + * ) exit 0 ;; + esac + ++# explicitly check whether we should take care of ZFS to ++# prevent us from _implicitly_ loading "zfs.ko" without reason ++zfs_enabled=`( \ ++ if [ -r /etc/defaults/rc.conf ]; then \ ++ . /etc/defaults/rc.conf; \ ++ source_rc_confs; \ ++ fi; \ ++ . /etc/rc.subr; \ ++ load_rc_config zfs; \ ++ if checkyesno zfs_enable; then \ ++ echo 'yes'; \ ++ else \ ++ echo 'no'; \ ++ fi ++) 2>/dev/null || true` ++ + # determine run-time tag and current hour + time_tag="$1" + time_hour=$((0 + `date '+%k'`)) +@@ -87,10 +103,14 @@ + OIFS="$IFS"; IFS="$IFS," + for fs in $fs_list; do + IFS="$OIFS" +- # sanity check filesystem snapshot schedule +- if [ $((0 + $when_weekly + $when_daily + $when_hourly)) -gt 20 ]; then +- logger -p daemon.warning \ +- "snapshot: schedule $schedule on filesystem $fs would require more than maximum number of 20 possible snapshots" ++ if [ ".$zfs_enabled" = .yes ] && (zfs list $fs) >/dev/null 2>&1; then ++ : ++ else ++ # sanity check filesystem snapshot schedule ++ if [ $((0 + $when_weekly + $when_daily + $when_hourly)) -gt 20 ]; then ++ logger -p daemon.warning \ ++ "snapshot: schedule $schedule on ufs filesystem $fs would require more than maximum number of 20 possible snapshots" ++ fi + fi + + # determine whether to make a snapshot Property changes on: head/sysutils/freebsd-snapshot/files/patch-allow-unlimited-snapshots-on-zfs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property