diff options
author | Tim Bishop <tdb@FreeBSD.org> | 2009-10-26 11:26:31 +0000 |
---|---|---|
committer | Tim Bishop <tdb@FreeBSD.org> | 2009-10-26 11:26:31 +0000 |
commit | b3b4b2d232922fed6e75f0c2ee035a8ee880b8a2 (patch) | |
tree | 9d30dea733cdbfd9cd1b7c4c0bb8a3effd1cf6b2 /sysutils/freebsd-snapshot/files/patch-snapshot | |
parent | - fix oder of patches when build WITHOUT_SHARED_MILTER (diff) |
- Update to 20090914.1
- Remove patch that has been integrated upstream
PR: ports/139464
Approved by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=243324
Diffstat (limited to 'sysutils/freebsd-snapshot/files/patch-snapshot')
-rw-r--r-- | sysutils/freebsd-snapshot/files/patch-snapshot | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/sysutils/freebsd-snapshot/files/patch-snapshot b/sysutils/freebsd-snapshot/files/patch-snapshot index 3f1ae8745c36..86e1ba2f1977 100644 --- a/sysutils/freebsd-snapshot/files/patch-snapshot +++ b/sysutils/freebsd-snapshot/files/patch-snapshot @@ -11,28 +11,3 @@ # option defaults fs_subdir=".snap" -@@ -271,7 +271,7 @@ - i=19 - k=`expr $maxgen - 1` - while [ $i -gt $k ]; do -- if zfs list "$fs_name@$fs_tag.$i" >/dev/null 2>&1; then -+ if zfs list -t snapshot "$fs_name@$fs_tag.$i" >/dev/null 2>&1; then - system zfs destroy "$fs_name@$fs_tag.$i" - fi - i=`expr $i - 1` -@@ -280,12 +280,12 @@ - if [ $maxgen -gt 0 ]; then - # rotate remaining snapshots - i=$k -- if zfs list "$fs_name@$fs_tag.$i" >/dev/null 2>&1; then -+ if zfs list -t snapshot "$fs_name@$fs_tag.$i" >/dev/null 2>&1; then - system zfs destroy "$fs_name@$fs_tag.$i" - fi - i=`expr $i - 1` - while [ $i -ge $fs_gen ]; do -- if zfs list "$fs_name@$fs_tag.$i" >/dev/null 2>&1; then -+ if zfs list -t snapshot "$fs_name@$fs_tag.$i" >/dev/null 2>&1; then - j=`expr $i + 1` - system zfs rename "$fs_name@$fs_tag.$i" "$fs_name@$fs_tag.$j" - fi - |