Compare commits

...

108 Commits
dev ... master

Author SHA1 Message Date
Drew Bonasera aa14313d04 Fixes for rc.local issues
- Display warning when no existing /etc/rc.local is found
- Only try to run old /etc/rc.local if it actually exists

Closes #151
Closes #267
2023-12-01 02:35:06 -05:00
Drew Bonasera 48d175607e Check if loopback automatically gets mounted by OS and umount it
Closes #254
2023-02-14 03:59:58 -05:00
Drew Bonasera 87e1ff064e Remove current image cleanup code
Closes #257
2023-02-14 03:59:19 -05:00
Drew Bonasera 43f1a885cd
Merge pull request #207 from wh201906/wh201906_locale
Force locale settings into POSIX

Closes #208
2021-08-16 05:06:41 -04:00
wh201906 be00c478e0 Force locale settings into POSIX
In CJK (Chinese, Japanese and Korean) computing,
graphic characters are traditionally classed into fullwidth.
For users who use CJK locales, the colon in the output is ':', rather than ':'.
The script cannot handle these characers, so forcing locale settings into English temporarily can solve this problem.
2021-08-14 03:53:33 +08:00
Drew Bonasera 9d9c0dd32c
Merge pull request #185 from freddii/master
fixed typos
2021-01-23 16:10:45 -05:00
freddii fa3c7a2740 fixed typos 2021-01-21 22:57:36 +01:00
Drew Bonasera 2b6afa184e
Merge pull request #162 from agsdot/patch-1
Fix typo
2020-09-09 16:16:12 -04:00
Jonathan Lai f6be7f3f50
expantion -> expansion 2020-09-09 11:21:40 -07:00
Drew Bonasera ee4e7ac5c8
Merge pull request #156 from archerindigo/master
Fix log removal
2020-08-27 02:00:53 -04:00
Terry Tsang a7977b9960 Fix log removal 2020-08-26 22:20:23 +08:00
Drew Bonasera dfdf279278 Update usage info 2020-06-17 15:21:29 -04:00
Drew Bonasera ad4657a0aa Remove NOOBS warning since we partly support it now and add VirtualBox warning 2020-06-17 15:17:15 -04:00
Drew Bonasera a846e0c013 Fix spacing issue in usage 2020-06-15 19:00:26 -04:00
Drew Bonasera 762acea7fc Revert "Remove verbose option setting from zipping tool options"
This reverts commit 66355825bd.

I removed a feature that was used so I'm adding it back as talked about in #147
2020-06-15 18:56:06 -04:00
Drew Bonasera cc4ca215b4 Remove quoting that broke zip tool usage 2020-06-15 18:41:42 -04:00
Drew Bonasera 2f5b275675 Change error codes so shellcheck will stop yelling at me 2020-06-14 18:39:41 -04:00
Drew Bonasera 66355825bd Remove verbose option setting from zipping tool options
Closes #147
2020-06-14 18:36:41 -04:00
Drew Bonasera 53a59cf9a0 Initial support for extended partition images :D 2020-06-13 17:10:19 -04:00
Drew Bonasera 574fab3e52 Add partprobe as it might help some users
Relates to #138
2020-06-13 16:19:04 -04:00
Drew Bonasera 370e88d581 Fix quoting issues
Closes #146
2020-06-13 16:12:39 -04:00
Drew Bonasera c80642512e Merge branch 'master' of github.com:Drewsif/PiShrink 2020-06-13 15:08:43 -04:00
Drew Bonasera 9f817a3483
Merge pull request #142 from framps/issue138
Deleted ERR cleanup and added check for rc.local existence

Closes #128
2020-06-13 15:00:28 -04:00
Drew Bonasera 071799b926
Merge pull request #139 from framps/fix_toolcheck
Fixed two minor issues
2020-06-13 14:59:02 -04:00
framp 0a45a5fdae Deleted ERR cleanup and added check for rc.local existance 2020-06-01 12:46:04 +02:00
framp 198e6c944f
Remove zip extension in target 2020-05-23 11:40:53 +02:00
framp c1c8a0b4a2
Fixed required tools bug 2020-05-23 11:11:49 +02:00
Drew Bonasera 26cd138b9b More verbose and earlier errors on incompatible images 2020-04-27 06:17:07 -04:00
Drew Bonasera d38666fefd
Merge pull request #134 from framps/fix133
Fix for issue #133
2020-04-20 16:37:40 -04:00
framp 3c3f68f59f
Added missing tail when retrieving partnum 2020-04-20 14:58:25 +02:00
framp 9a2c7fe949
Fixed pishrink issue #133 2020-04-20 14:07:11 +02:00
Drew Bonasera 24c6f57efd
Merge pull request #129 from kmpm/fix/parted
Fail with error message on parted error
2020-04-19 16:33:24 -04:00
Drew Bonasera 18c86f53fc
Merge branch 'master' into fix/parted 2020-04-19 16:32:50 -04:00
Drew Bonasera 6969b930eb
Merge pull request #126 from framps/other_zip_tools
Support to compress final pishrink image by using parallel compression feature of gzip and xz
2020-04-19 16:24:56 -04:00
kmpm c99b053afb stop on parted error 2020-04-09 18:17:47 +02:00
framp 547f73f71c
Merge pull request #1 from OmegaSquad82/patch-1
Update README.md
2020-03-01 19:34:46 +01:00
OmegaSquad82 f337674f58
Update README.md 2020-03-01 19:22:52 +01:00
framp d80d48a645 Minor code cleanup and README update 2020-02-29 14:52:35 +01:00
framp b4db6c1a64 Patch from OmegaSquad82 2020-02-27 16:42:43 +01:00
framp fda7a38ba1 Updated README 2020-02-07 17:47:09 +01:00
framp c7d74a73e7 Use -Z and -z instead of -i and use pigz now 2020-02-07 17:30:38 +01:00
framp ab32008981 Added support for gzip and xz only 2020-02-07 16:49:22 +01:00
framp 965fc206d7
Fixed typo 2020-01-12 10:28:33 +01:00
framp 7515ee5631 Updated README 2020-01-12 10:23:22 +01:00
framp 3a931ddb73 Updated README 2020-01-11 15:24:52 +01:00
framp 4ed3162284 Initial version which supports addl zip tools 2020-01-11 15:21:54 +01:00
framp 9de4f53b96 Added some more dbug logs 2020-01-09 13:21:55 +01:00
Drew Bonasera 4f61a3244a
Merge pull request #123 from daveilers/daveilers-sysprep-1
Add sysprep-ish steps
2020-01-05 23:04:04 -05:00
daveilers 74b106e763
Add sysprep-ish steps
Add an option to remove logs, apt archives, dhcp client leases and ssh hostkeys from image while shrinking.
2020-01-03 09:49:25 -08:00
Drew Bonasera 83eb694145
Merge pull request #112 from wfroemgen/patch-2
deleted option "p" from usage example
2019-12-03 16:51:27 -05:00
Drew Bonasera de507888ad
Merge pull request #113 from wfroemgen/patch-1
deleted option "p" from usage example
2019-12-03 16:50:57 -05:00
wfroemgen 6de66c2605
Update README.md
deleted option "p" from usage example
2019-10-28 09:46:29 +01:00
wfroemgen 054f6c7902
Update pishrink.sh
deleted option "p" from usage example
2019-10-28 09:44:41 +01:00
Drew Bonasera 17346f5d02 Update docs 2019-08-27 04:15:31 -04:00
Drew Bonasera 20ae97d2bc Add gzip option 2019-08-27 03:52:43 -04:00
Drew Bonasera 97b9a5db39 Make pishrink always try to repair the filesystem
There were far too many people having to repair the filesystems by hand. Since the image would be mostly unusable anyway, I feel confident doing it on the image without copying.
2019-08-27 01:13:11 -04:00
Drew Bonasera 27f8780508 Add double quote to prevent globbing and word splitting 2019-08-27 01:11:27 -04:00
Drew Bonasera 562142b841 Merge branch 'offer_filesystem_repair_option' of https://github.com/framps/PiShrink 2019-08-26 23:35:15 -04:00
Drew Bonasera 95f4839152
Merge pull request #108 from framps/issue84
Fixed issue #84
2019-08-26 01:22:52 -04:00
framp cfe5cc5534 Fixed issue #84 2019-08-23 15:46:45 +02:00
framp 1dfe90f650 Added additional e2fscks with option -r and -p 2019-07-30 15:33:33 +02:00
Drew Bonasera cbd4720ea9
Merge pull request #75 from framps/debug
Add debug infrastructure for debug statements
2019-07-29 19:44:11 -04:00
Drew Bonasera 76d2254d90
Merge pull request #89 from clach04/patch-1
Typo in readme
2019-01-17 13:51:41 -05:00
clach04 c51d0697a2
Typo in readme 2019-01-16 21:14:16 -08:00
Drew Bonasera c857e166c9
Fix typo in readme
Fixes #87
2019-01-10 16:44:18 -05:00
framp db62822a42 Removed some checks 2018-08-19 22:05:28 +02:00
framp 700bf3cdcc Updated README 2018-08-19 18:09:58 +02:00
framp 15c43f1199 Merge with debug branch 2018-08-19 17:59:44 +02:00
framp 8a0637b3da Initial debug and error checking version 2018-08-19 17:54:23 +02:00
framp c68ff6d502 Added option -r 2018-08-19 17:46:55 +02:00
framp 0fea4cc2a7 Update 2018-08-17 22:15:16 +02:00
framp b0ffc3afd9 Initial debug and error checking version 2018-08-17 21:48:21 +02:00
Drew Bonasera fd6c0b1ba4
Merge pull request #55 from framps/master
Added cleanup of loop device in case of execution errors
Closes #54
2018-03-30 13:58:52 -04:00
framp 8aae06a4b2 Modified cleanup 2018-03-24 12:01:59 +01:00
framp 3dbbbd6df6 merge 2018-02-14 20:08:05 +01:00
framp 67add2e613 Added cleanup function trap 2018-02-14 20:07:11 +01:00
framp eda1092cc5 Added cleanup function trap 2018-02-14 20:05:03 +01:00
Drew Bonasera 83e72eeec3
Add NOOBS warning to README 2018-02-03 18:00:44 -05:00
Drew Bonasera eac933beb8 Add `-a minimal` to parted call to fix errors with some images 2018-02-03 17:38:31 -05:00
Drew Bonasera 54051ea2e3
Merge pull request #43 from framps/master
Added installation instructions in README
2018-02-03 17:03:32 -05:00
Drew Bonasera 551e9950ac
Reorder Readme 2018-02-03 17:02:23 -05:00
Drew Bonasera 8dccf7d154
Merge pull request #40 from lurch/various-tweaks
Various tweaks
2018-02-03 16:53:34 -05:00
Andrew Scheller 3568798dd4 Give the new file the same ownership as the old file
(instead of having it always owned just by root)
2018-01-29 09:58:24 +00:00
Andrew Scheller 201db16c93 Replace `expr` with bash built-in arithmetic, and tidy up free-space calculation 2018-01-29 09:58:24 +00:00
Andrew Scheller 8331faf8f3 Check for additional required commands 2018-01-29 09:58:24 +00:00
Andrew Scheller e3ff4d20aa Double-quote all the filenames 2018-01-29 09:58:24 +00:00
Andrew Scheller ec95ba8097 `ls` doesn't need `-a` flag when passed a filename 2018-01-29 09:57:19 +00:00
Andrew Scheller c69f57affe Tighten up grep matches 2018-01-29 09:57:19 +00:00
Andrew Scheller 8784bda989 Avoid calling identical commands multiple times 2018-01-29 09:57:19 +00:00
Andrew Scheller 49964b512c Remove the unnecessary `tr -d '\n'` parts 2018-01-29 09:57:19 +00:00
Andrew Scheller 0b19d6c6ea Add the -s flag to all parted commands 2018-01-29 09:57:19 +00:00
Andrew Scheller b787dd4e66 Always quote echo strings 2018-01-29 09:57:19 +00:00
Andrew Scheller b11de9a8ee Remove unused variables 2018-01-29 09:57:19 +00:00
Andrew Scheller 9d6392d0c2 Use $() for command-substitution instead of backticks 2018-01-29 09:57:19 +00:00
framp 2d2c4d5802 Added installation instructions in README 2018-01-27 20:45:32 +01:00
Drew Bonasera 2aa44f0ecd
Fix error return value
Closes #39
2018-01-27 00:03:04 -05:00
Drew Bonasera e7857ff47c
Merge pull request #38 from lurch/patch-1
Don't allow a directory to be selected
2018-01-21 17:58:56 -05:00
Andrew Scheller 2229ae89a6
Don't allow a directory to be selected
The `-e` flag checks for a file _or_ a directory of that name. The `-f` flag checks only for files.
2018-01-21 22:08:43 +00:00
Drew Bonasera c40b443072
Merge pull request #34 from framps/master
Autorepair e2fsck errors
Closes #32
2018-01-16 00:52:54 -05:00
Drew Bonasera 5a89ff4262
Fix typos in README 2018-01-16 00:40:29 -05:00
framp f83e3f341d Autorepair fsck errors 2017-12-29 18:03:11 +01:00
Drew Bonasera da3bf15dac
Merge pull request #31 from framps/master
Handle filenames with spaces
Fixes #30
2017-12-07 00:17:18 -05:00
framp 4af698457e Accept filenames with spaces 2017-12-02 23:18:54 +01:00
Drew Bonasera ff89083249 Update auto expanding script
It now attempts to use raspi-config and falls back on the (updated) hard coded procedure. This should
help prevent some incompatibility issues.
2017-10-24 03:50:46 -04:00
Drew Bonasera 63b7509ade Merge pull request #15 from shatteredsword/master
reverted to using raspi-config to be used for automatic image resizing
Closes #18
2017-07-15 00:40:28 -04:00
Drew Bonasera e326f426bb Merge pull request #17 from raspberrycoulis/patch-1
Update README.md
2017-07-12 22:34:09 -04:00
Wesley Archer f5246e8898 Update README.md
Added prerequisite about needing Ubuntu 16.10 and upwards to prevent e2fsck and metatdata_csum error message.
2017-07-12 16:35:15 +01:00
Sean Mayo 0b04de8118 reverted to using raspi-config to be used for automatic image resizing
while not having to rely on the raspi-config tool does make the pishrink utility more portable, the raspi-config tool is already properly maintained. rather than being forced to maintain the autosizing utility in this script (which has already been broken for several months due to a linux kernal change), it just makes more sense to not have to rewrite properly maintained code.
2017-07-07 15:53:20 -07:00
2 changed files with 452 additions and 135 deletions

115
README.md
View File

@ -1,35 +1,80 @@
# PiShrink #
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: ./pishrink [-s] 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.
## Example ##
```bash
[user@localhost PiShrink]$ sudo ./shrink.sh pi.img
e2fsck 1.42.9 (28-Dec-2013)
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
/dev/loop1: 88262/1929536 files (0.2% non-contiguous), 842728/7717632 blocks
resize2fs 1.42.9 (28-Dec-2013)
resize2fs 1.42.9 (28-Dec-2013)
Resizing the filesystem on /dev/loop1 to 773603 (4k) blocks.
Begin pass 2 (max = 100387)
Relocating blocks XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
Begin pass 3 (max = 236)
Scanning inode table XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
Begin pass 4 (max = 7348)
Updating inode references XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
The filesystem on /dev/loop1 is now 773603 blocks long.
Shrunk pi.img from 30G to 3.1G
```
## Contributing ##
If you find a bug please create an issue for it. If you would like a new feature added, you can create an issue for it but I can't promise that I will get to it.
Pull requests for new features and bug fixes are more than welcome!
# PiShrink #
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.
In addition the shrunk image can be compressed with gzip and xz to create an even smaller image. Parallel compression of the image
using multiple cores is supported.
## Usage ##
```
Usage: $0 [-adhrsvzZ] imagefile.img [newimagefile.img]
-s Don't expand filesystem when image is booted the first time
-v Be verbose
-r Use advanced filesystem repair option if the normal one fails
-z Compress image after shrinking with gzip
-Z Compress image after shrinking with xz
-a Compress image in parallel using multiple cores
-d Write debug messages in a debug log file
```
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.
* `-s` prevents automatic filesystem expansion on the images next boot
* `-v` enables more verbose output
* `-r` will attempt to repair the filesystem using additional options if the normal repair fails
* `-z` will compress the image after shrinking using gzip. `.gz` extension will be added to the filename.
* `-Z` will compress the image after shrinking using xz. `.xz` extension will be added to the filename.
* `-a` will use option -f9 for pigz and option -T0 for xz and compress in parallel.
* `-d` will create a logfile `pishrink.log` which may help for problem analysis.
Default options for compressors can be overwritten by defining PISHRINK_GZIP or PSHRINK_XZ environment variables for gzip and xz.
## Prerequisites ##
If you are running PiShrink in VirtualBox you will likely encounter an error if you
attempt to use VirtualBox's "Shared Folder" feature. You can copy the image you wish to
shrink on to the VM from a Shared Folder, but shrinking directctly from the Shared Folder
is know to cause issues.
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.
## Installation ##
```bash
wget https://raw.githubusercontent.com/Drewsif/PiShrink/master/pishrink.sh
chmod +x pishrink.sh
sudo mv pishrink.sh /usr/local/bin
```
## Example ##
```bash
[user@localhost PiShrink]$ sudo pishrink.sh pi.img
e2fsck 1.42.9 (28-Dec-2013)
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
/dev/loop1: 88262/1929536 files (0.2% non-contiguous), 842728/7717632 blocks
resize2fs 1.42.9 (28-Dec-2013)
resize2fs 1.42.9 (28-Dec-2013)
Resizing the filesystem on /dev/loop1 to 773603 (4k) blocks.
Begin pass 2 (max = 100387)
Relocating blocks XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
Begin pass 3 (max = 236)
Scanning inode table XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
Begin pass 4 (max = 7348)
Updating inode references XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
The filesystem on /dev/loop1 is now 773603 blocks long.
Shrunk pi.img from 30G to 3.1G
```
## Contributing ##
If you find a bug please create an issue for it. If you would like a new feature added, you can create an issue for it but I can't promise that I will get to it.
Pull requests for new features and bug fixes are more than welcome!

View File

@ -1,81 +1,113 @@
#!/bin/bash
usage() { echo "Usage: $0 [-s] imagefile.img [newimagefile.img]"; exit -1; }
version="v0.1.4"
should_skip_autoexpand=false
CURRENT_DIR="$(pwd)"
SCRIPTNAME="${0##*/}"
MYNAME="${SCRIPTNAME%.*}"
LOGFILE="${CURRENT_DIR}/${SCRIPTNAME%.*}.log"
REQUIRED_TOOLS="parted losetup tune2fs md5sum e2fsck resize2fs"
ZIPTOOLS=("gzip xz")
declare -A ZIP_PARALLEL_TOOL=( [gzip]="pigz" [xz]="xz" ) # parallel zip tool to use in parallel mode
declare -A ZIP_PARALLEL_OPTIONS=( [gzip]="-f9" [xz]="-T0" ) # options for zip tools in parallel mode
declare -A ZIPEXTENSIONS=( [gzip]="gz" [xz]="xz" ) # extensions of zipped files
while getopts ":s" opt; do
case "${opt}" in
s) should_skip_autoexpand=true ;;
*) usage ;;
esac
done
shift $((OPTIND-1))
function info() {
echo "$SCRIPTNAME: $1 ..."
}
#Args
img=$1
function error() {
echo -n "$SCRIPTNAME: ERROR occurred in line $1: "
shift
echo "$@"
}
#Usage checks
if [[ -z $img ]]; then
usage
fi
if [[ ! -e $img ]]; then
echo "ERROR: $img is not a file..."
exit -2
fi
if (( EUID != 0 )); then
echo "ERROR: You need to be running as root."
exit -3
function cleanup() {
if losetup "$loopback" &>/dev/null; then
losetup -d "$loopback"
fi
if [ "$debug" = true ]; then
local old_owner=$(stat -c %u:%g "$src")
chown "$old_owner" "$LOGFILE"
fi
}
function logVariables() {
if [ "$debug" = true ]; then
echo "Line $1" >> "$LOGFILE"
shift
local v var
for var in "$@"; do
eval "v=\$$var"
echo "$var: $v" >> "$LOGFILE"
done
fi
}
function checkFilesystem() {
info "Checking filesystem"
e2fsck -pf "$loopback"
(( $? < 4 )) && return
info "Filesystem error detected!"
info "Trying to recover corrupted filesystem"
e2fsck -y "$loopback"
(( $? < 4 )) && return
if [[ $repair == true ]]; then
info "Trying to recover corrupted filesystem - Phase 2"
e2fsck -fy -b 32768 "$loopback"
(( $? < 4 )) && return
fi
error $LINENO "Filesystem recoveries failed. Giving up..."
exit 9
#Check that what we need is installed
A=`which parted 2>&1`
if (( $? != 0 )); then
echo "ERROR: parted is not installed."
exit -4
fi
}
#Copy to new file if requested
if [ -n "$2" ]; then
echo "Copying $1 to $2..."
cp --reflink=auto --sparse=always "$1" "$2"
if (( $? != 0 )); then
echo "ERROR: Could not copy file..."
exit -5
fi
img=$2
fi
function set_autoexpand() {
#Make pi expand rootfs on next boot
mountdir=$(mktemp -d)
partprobe "$loopback"
sleep 3
umount "$loopback" > /dev/null 2>&1
mount "$loopback" "$mountdir" -o rw
if (( $? != 0 )); then
info "Unable to mount loopback, autoexpand will not be enabled"
return
fi
#Gather info
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'`
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`
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'`
if [ ! -d "$mountdir/etc" ]; then
info "/etc not found, autoexpand will not be enabled"
umount "$mountdir"
return
fi
#Check if we should make pi expand rootfs on next boot
if [ "$should_skip_autoexpand" = false ]; then
#Make pi expand rootfs on next boot
mountdir=`mktemp -d`
mount $loopback $mountdir
if [[ ! -f "$mountdir/etc/rc.local" ]]; then
info "An existing /etc/rc.local was not found, autoexpand may fail..."
fi
if [ `md5sum $mountdir/etc/rc.local | cut -d ' ' -f 1` != "c4eb22d9aa99915af319287d194d4529" ]; then
echo Creating new /etc/rc.local
mv $mountdir/etc/rc.local $mountdir/etc/rc.local.bak
###Do not touch the following 6 lines including EOF###
cat <<\EOFE > $mountdir/etc/rc.local
if [[ -f "$mountdir/etc/rc.local" ]] && [[ "$(md5sum "$mountdir/etc/rc.local" | cut -d ' ' -f 1)" != "5c286b336c0606ed8e6f87708f7802eb" ]]; then
echo "Creating new /etc/rc.local"
if [ -f "$mountdir/etc/rc.local" ]; then
mv "$mountdir/etc/rc.local" "$mountdir/etc/rc.local.bak"
fi
#####Do not touch the following lines#####
cat <<\EOF1 > "$mountdir/etc/rc.local"
#!/bin/bash
do_expand_rootfs() {
ROOT_PART=$(cat /proc/cmdline | tr -s ' ' '\n' | grep root= | cut -d '=' -f 2)
if [[ "$ROOT_PART" != /dev/mmcblk0* ]] ; then
echo $ROOT_PART is not an SD card...
ROOT_PART=$(mount | sed -n 's|^/dev/\(.*\) on / .*|\1|p')
PART_NUM=${ROOT_PART#mmcblk0p}
if [ "$PART_NUM" = "$ROOT_PART" ]; then
echo "$ROOT_PART is not an SD card. Don't know how to expand"
return 0
fi
PART_NUM=$(echo $ROOT_PART | cut -d 'p' -f 2)
# Get the starting offset of the root partition
PART_START=$(fdisk -l /dev/mmcblk0 | grep $ROOT_PART | tr -s ' ' | cut -d ' ' -f 2)
PART_START=$(parted /dev/mmcblk0 -ms unit s p | grep "^${PART_NUM}" | cut -f 2 -d: | sed 's/[^0-9]//g')
[ "$PART_START" ] || return 1
# Return value will likely be error for fdisk as it fails to reload the
# partition table because the root fs is mounted
@ -88,70 +120,310 @@ p
$PART_NUM
$PART_START
p
w
EOF
cat <<EOF > /etc/rc.local &&
#!/bin/sh
resize2fs $ROOT_PART
rm -f /etc/rc.local; cp -f /etc/rc.local.bak /etc/rc.local; /etc/rc.local
echo "Expanding /dev/$ROOT_PART"
resize2fs /dev/$ROOT_PART
rm -f /etc/rc.local; cp -fp /etc/rc.local.bak /etc/rc.local && /etc/rc.local
EOF
reboot
exit
}
do_expand_rootfs
rm -f /etc/rc.local; cp -f /etc/rc.local.bak /etc/rc.local; /etc/rc.local
exit 0
EOFE
###End no touch zone###
chmod +x $mountdir/etc/rc.local
fi
umount $mountdir
raspi_config_expand() {
/usr/bin/env raspi-config --expand-rootfs
if [[ $? != 0 ]]; then
return -1
else
echo Skipping autoexpanding process...
rm -f /etc/rc.local; cp -fp /etc/rc.local.bak /etc/rc.local && /etc/rc.local
reboot
exit
fi
}
raspi_config_expand
echo "WARNING: Using backup expand..."
sleep 5
do_expand_rootfs
echo "ERROR: Expanding failed..."
sleep 5
if [[ -f /etc/rc.local.bak ]]; then
cp -fp /etc/rc.local.bak /etc/rc.local
/etc/rc.local
fi
exit 0
EOF1
#####End no touch zone#####
chmod +x "$mountdir/etc/rc.local"
fi
umount "$mountdir"
}
help() {
local help
read -r -d '' help << EOM
Usage: $0 [-adhrsvzZ] imagefile.img [newimagefile.img]
-s Don't expand filesystem when image is booted the first time
-v Be verbose
-r Use advanced filesystem repair option if the normal one fails
-z Compress image after shrinking with gzip
-Z Compress image after shrinking with xz
-a Compress image in parallel using multiple cores
-d Write debug messages in a debug log file
EOM
echo "$help"
exit 1
}
should_skip_autoexpand=false
debug=false
repair=false
parallel=false
verbose=false
ziptool=""
while getopts ":adhrsvzZ" opt; do
case "${opt}" in
a) parallel=true;;
d) debug=true;;
h) help;;
r) repair=true;;
s) should_skip_autoexpand=true ;;
v) verbose=true;;
z) ziptool="gzip";;
Z) ziptool="xz";;
*) help;;
esac
done
shift $((OPTIND-1))
if [ "$debug" = true ]; then
info "Creating log file $LOGFILE"
rm "$LOGFILE" &>/dev/null
exec 1> >(stdbuf -i0 -o0 -e0 tee -a "$LOGFILE" >&1)
exec 2> >(stdbuf -i0 -o0 -e0 tee -a "$LOGFILE" >&2)
fi
echo "${0##*/} $version"
#Args
src="$1"
img="$1"
#Usage checks
if [[ -z "$img" ]]; then
help
fi
if [[ ! -f "$img" ]]; then
error $LINENO "$img is not a file..."
exit 2
fi
if (( EUID != 0 )); then
error $LINENO "You need to be running as root."
exit 3
fi
# set locale to POSIX(English) temporarily
# these locale settings only affect the script and its sub processes
export LANGUAGE=POSIX
export LC_ALL=POSIX
export LANG=POSIX
# check selected compression tool is supported and installed
if [[ -n $ziptool ]]; then
if [[ ! " ${ZIPTOOLS[@]} " =~ $ziptool ]]; then
error $LINENO "$ziptool is an unsupported ziptool."
exit 17
else
if [[ $parallel == true && $ziptool == "gzip" ]]; then
REQUIRED_TOOLS="$REQUIRED_TOOLS pigz"
else
REQUIRED_TOOLS="$REQUIRED_TOOLS $ziptool"
fi
fi
fi
#Check that what we need is installed
for command in $REQUIRED_TOOLS; do
command -v $command >/dev/null 2>&1
if (( $? != 0 )); then
error $LINENO "$command is not installed."
exit 4
fi
done
#Copy to new file if requested
if [ -n "$2" ]; then
f="$2"
if [[ -n $ziptool && "${f##*.}" == "${ZIPEXTENSIONS[$ziptool]}" ]]; then # remove zip extension if zip requested because zip tool will complain about extension
f="${f%.*}"
fi
info "Copying $1 to $f..."
cp --reflink=auto --sparse=always "$1" "$f"
if (( $? != 0 )); then
error $LINENO "Could not copy file..."
exit 5
fi
old_owner=$(stat -c %u:%g "$1")
chown "$old_owner" "$f"
img="$f"
fi
# cleanup at script exit
trap cleanup EXIT
#Gather info
info "Gathering data"
beforesize="$(ls -lh "$img" | cut -d ' ' -f 5)"
parted_output="$(parted -ms "$img" unit B print)"
rc=$?
if (( $rc )); then
error $LINENO "parted failed with rc $rc"
info "Possibly invalid image. Run 'parted $img unit B print' manually to investigate"
exit 6
fi
partnum="$(echo "$parted_output" | tail -n 1 | cut -d ':' -f 1)"
partstart="$(echo "$parted_output" | tail -n 1 | cut -d ':' -f 2 | tr -d 'B')"
if [ -z "$(parted -s "$img" unit B print | grep "$partstart" | grep logical)" ]; then
parttype="primary"
else
parttype="logical"
fi
loopback="$(losetup -f --show -o "$partstart" "$img")"
tune2fs_output="$(tune2fs -l "$loopback")"
rc=$?
if (( $rc )); then
echo "$tune2fs_output"
error $LINENO "tune2fs failed. Unable to shrink this type of image"
exit 7
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)"
logVariables $LINENO beforesize parted_output partnum partstart parttype tune2fs_output currentsize blocksize
#Check if we should make pi expand rootfs on next boot
if [ "$parttype" == "logical" ]; then
echo "WARNING: PiShrink does not yet support autoexpanding of this type of image"
elif [ "$should_skip_autoexpand" = false ]; then
set_autoexpand
else
echo "Skipping autoexpanding process..."
fi
#Make sure filesystem is ok
e2fsck -f $loopback
minsize=`resize2fs -P $loopback | cut -d ':' -f 2 | tr -d ' ' | tr -d '\n'`
checkFilesystem
if ! minsize=$(resize2fs -P "$loopback"); then
rc=$?
error $LINENO "resize2fs failed with rc $rc"
exit 10
fi
minsize=$(cut -d ':' -f 2 <<< "$minsize" | tr -d ' ')
logVariables $LINENO currentsize minsize
if [[ $currentsize -eq $minsize ]]; then
echo ERROR: Image already shrunk to smallest size
exit -6
error $LINENO "Image already shrunk to smallest size"
exit 11
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
extra_space=$(($currentsize - $minsize))
logVariables $LINENO extra_space
for space in 5000 1000 100; do
if [[ $extra_space -gt $space ]]; then
minsize=$(($minsize + $space))
break
fi
done
logVariables $LINENO minsize
#Shrink filesystem
resize2fs -p $loopback $minsize
if [[ $? != 0 ]]; then
echo ERROR: resize2fs failed...
mount $loopback $mountdir
mv $mountdir/etc/rc.local.bak $mountdir/etc/rc.local
umount $mountdir
losetup -d $loopback
exit $rc
info "Shrinking filesystem"
resize2fs -p "$loopback" $minsize
rc=$?
if (( $rc )); then
error $LINENO "resize2fs failed with rc $rc"
mount "$loopback" "$mountdir"
mv "$mountdir/etc/rc.local.bak" "$mountdir/etc/rc.local"
umount "$mountdir"
losetup -d "$loopback"
exit 12
fi
sleep 1
#Shrink partition
losetup -d $loopback
partnewsize=`expr $minsize \* $blocksize | tr -d '\n'`
newpartend=`expr $partstart + $partnewsize | tr -d '\n'`
part1=`parted $img rm $partnum`
part2=`parted $img unit B mkpart primary $partstart $newpartend`
partnewsize=$(($minsize * $blocksize))
newpartend=$(($partstart + $partnewsize))
logVariables $LINENO partnewsize newpartend
parted -s -a minimal "$img" rm "$partnum"
rc=$?
if (( $rc )); then
error $LINENO "parted failed with rc $rc"
exit 13
fi
parted -s "$img" unit B mkpart "$parttype" "$partstart" "$newpartend"
rc=$?
if (( $rc )); then
error $LINENO "parted failed with rc $rc"
exit 14
fi
#Truncate the file
endresult=`parted -m $img unit B print free | tail -1 | cut -d ':' -f 2 | tr -d 'B\n'`
truncate -s $endresult $img
aftersize=`ls -lah $img | cut -d ' ' -f 5`
info "Shrinking image"
endresult=$(parted -ms "$img" unit B print free)
rc=$?
if (( $rc )); then
error $LINENO "parted failed with rc $rc"
exit 15
fi
echo "Shrunk $img from $beforesize to $aftersize"
endresult=$(tail -1 <<< "$endresult" | cut -d ':' -f 2 | tr -d 'B')
logVariables $LINENO endresult
truncate -s "$endresult" "$img"
rc=$?
if (( $rc )); then
error $LINENO "trunate failed with rc $rc"
exit 16
fi
# handle compression
if [[ -n $ziptool ]]; then
options=""
envVarname="${MYNAME^^}_${ziptool^^}" # PISHRINK_GZIP or PISHRINK_XZ environment variables allow to override all options for gzip or xz
[[ $parallel == true ]] && options="${ZIP_PARALLEL_OPTIONS[$ziptool]}"
[[ -v $envVarname ]] && options="${!envVarname}" # if environment variable defined use these options
[[ $verbose == true ]] && options="$options -v" # add verbose flag if requested
if [[ $parallel == true ]]; then
parallel_tool="${ZIP_PARALLEL_TOOL[$ziptool]}"
info "Using $parallel_tool on the shrunk image"
if ! $parallel_tool ${options} "$img"; then
rc=$?
error $LINENO "$parallel_tool failed with rc $rc"
exit 18
fi
else # sequential
info "Using $ziptool on the shrunk image"
if ! $ziptool ${options} "$img"; then
rc=$?
error $LINENO "$ziptool failed with rc $rc"
exit 19
fi
fi
img=$img.${ZIPEXTENSIONS[$ziptool]}
fi
aftersize=$(ls -lh "$img" | cut -d ' ' -f 5)
logVariables $LINENO aftersize
info "Shrunk $img from $beforesize to $aftersize"