From 81360c3fda2f173f9d940889cfe3592f056321ed Mon Sep 17 00:00:00 2001 From: William Petit Date: Wed, 26 Apr 2023 15:55:13 +0200 Subject: [PATCH] feat(turris,omnia): re-enable disk resizing --- .../omnia/uci-defaults/99-resize-disk.sh | 28 ++++++++----------- targets/turris.mk | 2 +- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/misc/turris/omnia/uci-defaults/99-resize-disk.sh b/misc/turris/omnia/uci-defaults/99-resize-disk.sh index 67de3c9..c6f3695 100644 --- a/misc/turris/omnia/uci-defaults/99-resize-disk.sh +++ b/misc/turris/omnia/uci-defaults/99-resize-disk.sh @@ -1,25 +1,21 @@ #!/bin/sh -# set -eo pipefail +set -eo pipefail -# FLAG_FILE=/root/.disk_resized +block info -# if [ -f "$FLAG_FILE" ]; then -# exit -# fi +DISK=/dev/mmcblk0 +PARTITION="${DISK}p2" -# DISK=/dev/mmcblk0 -# PARTITION="${DISK}p2" +parted -s -a opt "$DISK" "resizepart 2 100%" -# parted -s -a opt "$DISK" "resizepart 2 100%" +FS_SIZE="$(unsquashfs -s "$PARTITION" | grep -o 'Filesystem size [0-9]* bytes' | grep -o '[0-9][0-9]*')" +FS_OFFSET="$(expr '(' "$FS_SIZE" + 65535 ')' / 65536 '*' 65536)" +LOOP_DEVICE="$(losetup -f --show -o "$FS_OFFSET" "$PARTITION")" -# FS_SIZE="$(unsquashfs -s "$PARTITION" | grep -o 'Filesystem size [0-9]* bytes' | grep -o '[0-9][0-9]*')" -# FS_OFFSET="$(expr '(' "$FS_SIZE" + 65535 ')' / 65536 '*' 65536)" -# LOOP_DEVICE="$(losetup -f --show -o "$FS_OFFSET" "$PARTITION")" +e2fsck -y -f "$LOOP_DEVICE" +resize2fs "$LOOP_DEVICE" -# e2fsck -y -f "$LOOP_DEVICE" -# resize2fs "$LOOP_DEVICE" +rm -f /etc/uci-defaults/99-resize-disk.sh -# touch "$FLAG_FILE" - -# reboot \ No newline at end of file +reboot \ No newline at end of file diff --git a/targets/turris.mk b/targets/turris.mk index bff3167..4026240 100644 --- a/targets/turris.mk +++ b/targets/turris.mk @@ -5,7 +5,7 @@ turris: omnia omnia: $(MAKE) \ ADDITIONAL_INSTALL="install-turris-omnia-uci-defaults" \ - ADDITIONAL_OPENWRT_PACKAGES="losetup squashfs-tools-unsquashfs resize2fs e2fsprogs parted" \ + ADDITIONAL_OPENWRT_PACKAGES="losetup squashfs-tools-unsquashfs resize2fs e2fsprogs parted block-mount" \ OPENWRT_TARGET="mvebu/cortexa9" \ EMISSARY_ARCH="armv7" \ OPENWRT_PROFILE="cznic_turris-omnia" \