Remove ZFS comments
1 files changed, 8 insertions(+), 14 deletions(-)

M switchver
M switchver +8 -14
@@ 340,11 340,8 @@ deleteold()
 [[ $(type -t create_archive) ]] || create_archive()
 {
 	local base="$1"
-	#if [[ -v ATL_ZFS ]]; then
-	#	zfs_filesystem_exists "tank$base/old" || zfs create "tank$base/old"
-	#else
-		mkdir -p "$base"/old
-	#fi
+	[[ ! -v ATL_ZFS ]] || fail "Oh no, the non-ZFS version of create_archive() is being used although ATL_ZFS is defined"
+	mkdir -p "$base"/old
 }
 
 # Archive old version directory $2 for versioned app at absolute path $1

          
@@ 352,13 349,10 @@ deleteold()
 {
 	local base="$1"
 	local oldver="$2"
-	#if [[ -v ATL_ZFS ]]; then
-	#	zfs_delete_filesystem_if_exists "tank$base/old/$oldver"
-	#	zfs rename "tank$base/$oldver" "tank$base/old/$oldver"
-	#else
-		rm "$base/old/$oldver"    # This will be a symlink, so no -f
-		mv "$base/$oldver" old/
-	#fi
+	[[ ! -v ATL_ZFS ]] || fail "Oh no, the non-ZFS version of archive_oldversion() is being used although ATL_ZFS is defined"
+	rm "$base/old/$oldver"    # This will be a symlink, so no -f
+	log "Moving $base/$oldver to old/. If old/ is on a different filesystem this may take a while"
+	mv "$base/$oldver" old/
 }
 		
 # Unarchive old version directory $2 for versioned app at absolute path $1

          
@@ 366,8 360,8 @@ deleteold()
 {
 	local base="$1"
 	local oldver="$2"
-	# For ZFS this might be:
-	#	zfs rename "tank$base/old/$oldver" "tank$base/$oldver"
+	[[ ! -v ATL_ZFS ]] || fail "Oh no, the non-ZFS version of unarchive_oldversion() is being used although ATL_ZFS is defined"
+	log "Moving old/$oldprev to $base. If $oldprev/ is on a different filesystem this may take a while"
 	mv old/"$oldprev" "$base"
 }