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

Merge pull request #142 from framps/issue138 

Deleted ERR cleanup and added check for rc.local existence

Closes #128
This commit is contained in:
Drew Bonasera 2020-06-13 15:00:28 -04:00 committed by GitHub
parent 071799b926 0a45a5fdae
commit 9f817a3483
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pishrink.sh
View File

@ -176,7 +176,7 @@ if [ -n "$2" ]; then
fi fi
# cleanup at script exit # cleanup at script exit
trap cleanup ERR EXIT trap cleanup EXIT
#Gather info #Gather info
info "Gathering data" info "Gathering data"
@ -203,10 +203,11 @@ if [ "$should_skip_autoexpand" = false ]; then
mountdir=$(mktemp -d) mountdir=$(mktemp -d)
mount "$loopback" "$mountdir" mount "$loopback" "$mountdir"
if [ "$(md5sum "$mountdir/etc/rc.local" | cut -d ' ' -f 1)" != "0542054e9ff2d2e0507ea1ffe7d4fc87" ]; then if [[ -f "$mountdir/etc/rc.local" ]] && [[ "$(md5sum "$mountdir/etc/rc.local" | cut -d ' ' -f 1)" != "0542054e9ff2d2e0507ea1ffe7d4fc87" ]]; then
echo "Creating new /etc/rc.local" echo "Creating new /etc/rc.local"
mv "$mountdir/etc/rc.local" "$mountdir/etc/rc.local.bak" mv "$mountdir/etc/rc.local" "$mountdir/etc/rc.local.bak"
#####Do not touch the following lines#####
#####Do not touch the following lines#####
cat <<\EOF1 > "$mountdir/etc/rc.local" cat <<\EOF1 > "$mountdir/etc/rc.local"
#!/bin/bash #!/bin/bash
@ -241,7 +242,10 @@ cat <<EOF > /etc/rc.local &&
#!/bin/sh #!/bin/sh
echo "Expanding /dev/$ROOT_PART" echo "Expanding /dev/$ROOT_PART"
resize2fs /dev/$ROOT_PART resize2fs /dev/$ROOT_PART
rm -f /etc/rc.local; cp -f /etc/rc.local.bak /etc/rc.local; /etc/rc.local if [[ -f /etc/rc.local.bak ]]; then
cp -f /etc/rc.local.bak /etc/rc.local
/etc/rc.local
fi
EOF EOF
reboot reboot
@ -366,7 +370,7 @@ if [[ -n $ziptool ]]; then
[[ $parallel == true ]] && options="${ZIP_PARALLEL_OPTIONS[$ziptool]}" [[ $parallel == true ]] && options="${ZIP_PARALLEL_OPTIONS[$ziptool]}"
[[ -v $envVarname ]] && options="${!envVarname}" # if environment variable defined use these options [[ -v $envVarname ]] && options="${!envVarname}" # if environment variable defined use these options
[[ $verbose == true ]] && options="$options -v" # add verbose flag if requested [[ $verbose == true ]] && options="$options -v" # add verbose flag if requested
if [[ $parallel == true ]]; then if [[ $parallel == true ]]; then
parallel_tool="${ZIP_PARALLEL_TOOL[$ziptool]}" parallel_tool="${ZIP_PARALLEL_TOOL[$ziptool]}"
info "Using $parallel_tool on the shrunk image" info "Using $parallel_tool on the shrunk image"
@ -375,7 +379,7 @@ if [[ -n $ziptool ]]; then
error $LINENO "$parallel_tool failed with rc $rc" error $LINENO "$parallel_tool failed with rc $rc"
exit -18 exit -18
fi fi
else # sequential else # sequential
info "Using $ziptool on the shrunk image" info "Using $ziptool on the shrunk image"
if ! $ziptool ${options} $img; then if ! $ziptool ${options} $img; then