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

Merge f1da427a1b into 48d175607e

This commit is contained in:
Clemens Arth 2023-03-01 20:47:55 +01:00 committed by GitHub
parent 48d175607e f1da427a1b
commit bc74a5635e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pishrink.sh Executable file → Normal file
View File

@ -84,30 +84,42 @@ function set_autoexpand() {
return return
fi fi
if [[ -f "$mountdir/etc/rc.local" ]] && [[ "$(md5sum "$mountdir/etc/rc.local" | cut -d ' ' -f 1)" != "1c579c7d5b4292fd948399b6ece39009" ]]; then if ([[ -f "$mountdir/etc/rc.local" ]] && [[ "$(md5sum "$mountdir/etc/rc.local" | cut -d ' ' -f 1)" != "1c579c7d5b4292fd948399b6ece39009" ]]); then
echo "Creating new /etc/rc.local" info "Creating new /etc/rc.local"
isok=1
rclocal=1
boothook=/etc/rc.local
if [ -f "$mountdir/etc/rc.local" ]; then if [ -f "$mountdir/etc/rc.local" ]; then
mv "$mountdir/etc/rc.local" "$mountdir/etc/rc.local.bak" mv "$mountdir/etc/rc.local" "$mountdir/etc/rc.local.bak"
fi fi
elif [[ -d "$mountdir/var/lib/dietpi/postboot.d" ]]; then
info "Using postboot hooks..."
isok=1
rclocal=0
boothook=/var/lib/dietpi/postboot.d/inflatefs.sh
fi
if [ "$isok" -eq "1" ]; then
#####Do not touch the following lines##### #####Do not touch the following lines#####
cat <<\EOF1 > "$mountdir/etc/rc.local" cat <<\EOF1 > "$mountdir$boothook"
#!/bin/bash #!/bin/bash
do_expand_rootfs() { do_expand_rootfs() {
ROOT_PART=$(mount | sed -n 's|^/dev/\(.*\) on / .*|\1|p') ROOT_PART=$(mount | sed -n 's|^/dev/\(.*\) on / .*|\1|p')
DEV_PART=$(echo "$ROOT_PART" | cut -f1 -d"p")
PART_NUM=${ROOT_PART#mmcblk0p} PART_NUM=${ROOT_PART#"${DEV_PART}p"}
if [ "$PART_NUM" = "$ROOT_PART" ]; then if [ "$PART_NUM" = "$ROOT_PART" ]; then
echo "$ROOT_PART is not an SD card. Don't know how to expand" echo "$ROOT_PART is not an SD card. Don't know how to expand"
return 0 return 0
fi fi
# Get the starting offset of the root partition # Get the starting offset of the root partition
PART_START=$(parted /dev/mmcblk0 -ms unit s p | grep "^${PART_NUM}" | cut -f 2 -d: | sed 's/[^0-9]//g') PART_START=$(parted /dev/${DEV_PART} -ms unit s p | grep "^${PART_NUM}" | cut -f 2 -d: | sed 's/[^0-9]//g')
[ "$PART_START" ] || return 1 [ "$PART_START" ] || return 1
# Return value will likely be error for fdisk as it fails to reload the # Return value will likely be error for fdisk as it fails to reload the
# partition table because the root fs is mounted # partition table because the root fs is mounted
fdisk /dev/mmcblk0 <<EOF fdisk /dev/${DEV_PART} <<EOF
p p
d d
$PART_NUM $PART_NUM
@ -120,16 +132,20 @@ p
w w
EOF EOF
cat <<EOF > /etc/rc.local && cat <<EOF > BOOTHOOKFILE &&
#!/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
EOF EOF
if [ "RCLOCAL" -eq "1" ]; then
echo "rm -f /etc/rc.local; cp -f /etc/rc.local.bak /etc/rc.local; /etc/rc.local" >> BOOTHOOKFILE
else
echo "rm -f BOOTHOOKFILE" >> BOOTHOOKFILE
fi
reboot reboot
exit exit
} }
raspi_config_expand() { raspi_config_expand() {
/usr/bin/env raspi-config --expand-rootfs /usr/bin/env raspi-config --expand-rootfs
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
@ -140,20 +156,25 @@ else
exit exit
fi fi
} }
raspi_config_expand raspi_config_expand
echo "WARNING: Using backup expand..." echo "WARNING: Using backup expand..."
sleep 5 sleep 5
do_expand_rootfs do_expand_rootfs
echo "ERROR: Expanding failed..." echo "ERROR: Expanding failed..."
sleep 5 sleep 5
if [ "RCLOCAL" -eq "1" ]; then
if [[ -f /etc/rc.local.bak ]]; then if [[ -f /etc/rc.local.bak ]]; then
cp -f /etc/rc.local.bak /etc/rc.local cp -f /etc/rc.local.bak /etc/rc.local
/etc/rc.local /etc/rc.local
fi fi
fi
exit 0 exit 0
EOF1 EOF1
sed -i "s#BOOTHOOKFILE#$boothook#g; s#RCLOCAL#$rclocal#g" $mountdir$boothook
#####End no touch zone##### #####End no touch zone#####
chmod +x "$mountdir/etc/rc.local" chmod +x "$mountdir$boothook"
fi fi
umount "$mountdir" umount "$mountdir"
} }