zabpehely
/
PiShrink
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue #4 where the script tries to resize to a larger or equal size

This commit is contained in:
Drew Bonasera 2016-07-07 01:28:32 -04:00
parent 0b8020ac18
commit c519a658c7
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pishrink.sh
View File

@ -39,6 +39,8 @@ beforesize=`ls -lah $img | cut -d ' ' -f 5`
partnum=`parted -m $img unit B print | tail -n 1 | cut -d ':' -f 1 | tr -d '\n'` partnum=`parted -m $img unit B print | tail -n 1 | cut -d ':' -f 1 | tr -d '\n'`
partstart=`parted -m $img unit B print | tail -n 1 | cut -d ':' -f 2 | tr -d 'B\n'` partstart=`parted -m $img unit B print | tail -n 1 | cut -d ':' -f 2 | tr -d 'B\n'`
loopback=`losetup -f --show -o $partstart $img` loopback=`losetup -f --show -o $partstart $img`
currentsize=`tune2fs -l $loopback | grep 'Block count' | tr -d ' ' | cut -d ':' -f 2 | tr -d '\n'`
blocksize=`tune2fs -l $loopback | grep 'Block size' | tr -d ' ' | cut -d ':' -f 2 | tr -d '\n'`
#Make pi expand rootfs on next boot #Make pi expand rootfs on next boot
mountdir=`mktemp -d` mountdir=`mktemp -d`
@ -57,10 +59,24 @@ chmod +x $mountdir/etc/rc.local
fi fi
umount $mountdir umount $mountdir
#Shrink filesystem #Make sure filesystem is ok
e2fsck -f $loopback e2fsck -f $loopback
minsize=`resize2fs -P $loopback | cut -d ':' -f 2 | tr -d ' '` minsize=`resize2fs -P $loopback | cut -d ':' -f 2 | tr -d ' ' | tr -d '\n'`
minsize=`expr $minsize + 20000 | tr -d '\n'` if [[ $currentsize -eq $minsize ]]; then
echo ERROR: Image already shrunk to smallest size
exit -6
fi
#Add some free space to the end of the filesystem
if [[ `expr $currentsize - $minsize - 5000` -gt 0 ]]; then
minsize=`expr $minsize + 5000 | tr -d '\n'`
elif [[ `expr $currentsize - $minsize - 1000` -gt 0 ]]; then
minsize=`expr $minsize + 1000 | tr -d '\n'`
elif [[ `expr $currentsize - $minsize - 100` -gt 0 ]]; then
minsize=`expr $minsize + 100 | tr -d '\n'`
fi
#Shrink filesystem
resize2fs -p $loopback $minsize resize2fs -p $loopback $minsize
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
echo ERROR: resize2fs failed... echo ERROR: resize2fs failed...
@ -74,7 +90,7 @@ sleep 1
#Shrink partition #Shrink partition
losetup -d $loopback losetup -d $loopback
partnewsize=`expr $minsize \* 4096 | tr -d '\n'` partnewsize=`expr $minsize \* $blocksize | tr -d '\n'`
newpartend=`expr $partstart + $partnewsize | tr -d '\n'` newpartend=`expr $partstart + $partnewsize | tr -d '\n'`
part1=`parted $img rm $partnum` part1=`parted $img rm $partnum`
part2=`parted $img unit B mkpart primary $partstart $newpartend` part2=`parted $img unit B mkpart primary $partstart $newpartend`