Added additional e2fscks with option -r and -p

README.md

@@ -2,14 +2,15 @@
 PiShrink is a bash script that automatically shrink a pi image that will then resize to the max size of the SD card on boot. This will make putting the image back onto the SD card faster and the shrunk images will compress better.
 
 ## Usage ##
-`sudo pishrink.sh [-sdr] imagefile.img [newimagefile.img]`
+`sudo pishrink.sh [-sdrp] imagefile.img [newimagefile.img]`
 
 If the `-s` option is given the script will skip the autoexpanding part of the process.  If you specify the `newimagefile.img` parameter, the script will make a copy of `imagefile.img` and work off that. You will need enough space to make a full copy of the image to use that option.
 Option `-d` will create a logfile `pishrink.log` which may help for problem analysis.
 Option `-r` will try to recover a corrupted filesystem. You have to specify the `newimagefile.img` parameter and a recovery is done on a copy of the image.
+Option `-p` will try to recover a corrupted filesystem in paranoia mode. You have to specify the `newimagefile.img` parameter and a recovery is done on a copy of the image.
 
 ## Prerequisites ##
-If you are trying to shrink a [NOOBS](https://github.com/raspberrypi/noobs) image it will likely fail. This is due to [NOOBS paritioning](https://github.com/raspberrypi/noobs/wiki/NOOBS-partitioning-explained) being significantly different than Raspian's. Hopefully PiShrink will be able to support NOOBS in the near future.
+If you are trying to shrink a [NOOBS](https://github.com/raspberrypi/noobs) image it will likely fail. This is due to [NOOBS partitioning](https://github.com/raspberrypi/noobs/wiki/NOOBS-partitioning-explained) being significantly different than Raspbian's. Hopefully PiShrink will be able to support NOOBS in the near future.
 
 If using Ubuntu, you will likely see an error about `e2fsck` being out of date and `metadata_csum`. The simplest fix for this is to use Ubuntu 16.10 and up, as it will save you a lot of hassle in the long run.
 

pishrink.sh

@@ -2,12 +2,38 @@
 
 version="v0.1.1"
 
+CURRENT_DIR=$(pwd)
+SCRIPTNAME="${0##*/}"
+LOGFILE=${CURRENT_DIR}/${SCRIPTNAME%.*}.log
+
 function info() {
-	echo "$1..."
+	echo "$SCRIPTNAME: $1..."
+}
+
+# Returns 0 for success, <> 0 for failure
+function retry() { # command maxretry failuretest
+
+		local tries=1
+		local command="$1" # command to retry
+		local maxRetry=$2 # number of retries
+		local successtest="$3" # success test
+
+		while (( tries <= maxRetry )); do
+			info "Trying to recover corrupted filesystem. Trial $tries"
+			eval "$command"
+			rc=$?
+			eval "$successtest"
+			if (( ! $? )); then
+				info "Recovered filesystem error"
+				return 0
+			fi
+			(( tries++ ))
+		done
+		return 1
 }
 
 function error() {
-	echo -n "ERROR occured in line $1: "
+	echo -n "$SCRIPTNAME: ERROR occured in line $1: "
 	shift
 	echo "$@"
 }
@@ -35,26 +61,81 @@ function logVariables() {
 	fi
 }
 
-usage() { echo "Usage: $0 [-sdr] imagefile.img [newimagefile.img]"; exit -1; }
+function checkFilesystem() {
+
+	local stdTest="(( rc < 4 ))"
+	[[ $paranoia == true ]] && stdTest="(( rc == 0 ))"
+
+	local rc
+	info "Checking filesystem"
+	retry "e2fsck -pfttv \"$loopback\"" 3 "$stdTest"
+	rc=$?
+
+	(( ! rc )) && return
+
+	info "Filesystem error detected"
+
+	if [[ $paranoia != true ]]; then
+		error $LINENO "e2fsck failed. Filesystem corrupted. Try option -r or option -p."
+		exit -9
+	fi
+
+	info "Trying to recover corrupted filesystem (Phase1)"
+	retry "e2fsck -pftt \"$loopback\"" 3 "stdTest"
+	(( ! $? )) && return
+
+	info "Trying to recover corrupted filesystem (Phase2)."
+	retry "e2fsck -yv \"$loopback\"" 3 "$stdTest"
+	(( ! $? )) && return
+
+	info "Trying to recover corrupted filesystem (Phase3)."
+	retry "e2fsck -fttvy -b 32768 \"$loopback\"" 3 "$stdTest"
+	(( ! $? )) && return
+
+	error $LINENO "Filesystem recoveries failed. Giving up to fix corrupted filesystem."
+	exit -9
+
+}
+
+help() {
+	local help
+	read -r -d '' help << EOM
+-s: Don't expand filesystem when image is booted the first time
+-d: Write debug messages in a debug log file
+-r: Try to repair corrupted filesystem
+-p: Try to repair corrupted filesystem in paranoia mode
+EOM
+	echo $help
+	exit -1
+}
+
+usage() {
+	echo "Usage: $0 [-sdrph] imagefile.img [newimagefile.img]"
+	echo "-s: skip autoexpand"
+	echo "-d: debug mode on"
+	echo "-r: try to repair filesystem errors"
+	echo "-p: try to repair filesystem errors (paranoia mode)"
+	echo "-h: display help text"
+	exit -1
+}
 
 should_skip_autoexpand=false
 debug=false
 repair=false
+paranoia=false
 
-while getopts ":sdr" opt; do
+while getopts ":sdrph" opt; do
   case "${opt}" in
     s) should_skip_autoexpand=true ;;
     d) debug=true;;
     r) repair=true;;
+    p) paranoia=true;;
+    h) help;;
     *) usage ;;
   esac
 done
 shift $((OPTIND-1))
 
-CURRENT_DIR=$(pwd)
-SCRIPTNAME="${0##*/}"
-LOGFILE=${CURRENT_DIR}/${SCRIPTNAME%.*}.log
-
 if [ "$debug" = true ]; then
 	info "Creating log file $LOGFILE"
 	rm $LOGFILE &>/dev/null
@@ -80,8 +161,8 @@ if (( EUID != 0 )); then
   error $LINENO "You need to be running as root."
   exit -3
 fi
-if [[ -z "$2" && $repair == true ]]; then
+if [[ -z "$2" ]] && [[ $repair == true || $paranoia == true ]]; then
-  error $LINENO "Option -r requires to specify newimagefile.img."
+  error $LINENO "Option -r and -p require to specify newimagefile.img."
   exit -3
 fi
 
@@ -113,29 +194,11 @@ trap cleanup ERR EXIT
 #Gather info
 info "Gatherin data"
 beforesize=$(ls -lh "$img" | cut -d ' ' -f 5)
-logVariables $LINENO beforesize
+parted_output=$(parted -ms "$img" unit B print | tail -n 1)
-if ! parted_output=$(parted -ms "$img" unit B print); then
-	rc=$?
-	error $LINENO "parted failed with rc $rc"
-	exit -6
-fi
-parted_output=$(tail -n 1 <<< $parted_output)
-logVariables $LINENO parted_output
-
 partnum=$(echo "$parted_output" | cut -d ':' -f 1)
 partstart=$(echo "$parted_output" | cut -d ':' -f 2 | tr -d 'B')
-logVariables $LINENO partnum partstart
+loopback=$(losetup -f --show -o $partstart "$img")
-
+tune2fs_output=$(tune2fs -l "$loopback")
-info "Mounting image"
-if ! loopback=$(losetup -f --show -o $partstart "$img"); then
-	rc=$?
-	error $LINENO "losetup failed with rc $rc"
-	exit -7
-fi
-if ! tune2fs_output=$(tune2fs -l "$loopback"); then
-	error $LINENO "tunefs failed"
-	exit -8
-fi
 currentsize=$(echo "$tune2fs_output" | grep '^Block count:' | tr -d ' ' | cut -d ':' -f 2)
 blocksize=$(echo "$tune2fs_output" | grep '^Block size:' | tr -d ' ' | cut -d ':' -f 2)
 
@@ -218,15 +281,8 @@ else
 fi
 
 #Make sure filesystem is ok
-info "Checking filesystem"
+if [[ $repair == true ]]; then
-if ! e2fsck -pf "$loopback"; then
+	checkFilesystem
-	rc=$?
-	info "e2fsck failed with rc $rc. Filesystem is corrupt. Trying to fix filesystem"
-	if ! e2fsck -yv "$loopback"; then
-		rc=$?
-		error $LINENO "e2fsck -y failed with rc $rc. Giving up to fix corrupted filesystem."
-		exit -9
-	fi
 fi
 
 if ! minsize=$(resize2fs -P "$loopback"); then
@@ -295,6 +351,7 @@ if ! truncate -s $endresult "$img"; then
 	rc=$?
 	error $LINENO "trunate failed with rc $rc"
 	exit -16
+fi
 
 aftersize=$(ls -lh "$img" | cut -d ' ' -f 5)
 logVariables $LINENO aftersize