Merge 2d97ee2195 into aa14313d04

pishrink.sh

@@ -330,10 +330,8 @@ fi
 minsize=$(cut -d ':' -f 2 <<< "$minsize" | tr -d ' ')
 logVariables $LINENO currentsize minsize
 if [[ $currentsize -eq $minsize ]]; then
-  error $LINENO "Image already shrunk to smallest size"
-  exit 11
-fi
-
+  info "Filesystem already shrunk to smallest size. Skipping filesystem shrinking."
+else
   #Add some free space to the end of the filesystem
   extra_space=$(($currentsize - $minsize))
   logVariables $LINENO extra_space
@@ -358,8 +356,10 @@ if (( $rc )); then
     exit 12
   fi
   sleep 1
+fi
 
 #Shrink partition
+info "Shrinking partition"
 partnewsize=$(($minsize * $blocksize))
 newpartend=$(($partstart + $partnewsize))
 logVariables $LINENO partnewsize newpartend