fix(turris,omnia): reboot after disk resize

feat: use emissary v2023.4.14-813f837
feat: use emissary v2023.4.13-ed35ee5
2023-04-14 17:37:19 +02:00 · 2023-04-14 14:32:47 +00:00 · 2023-04-13 11:52:10 +00:00 · 2023-04-13 10:11:55 +00:00 · 2023-04-13 09:39:49 +00:00 · 2023-04-13 09:32:01 +00:00
4 changed files with 31 additions and 2 deletions
--- a/emissary_release.txt
+++ b/emissary_release.txt
@ -1 +1 @@
-v2023.4.6-06b1235
+v2023.4.14-813f837
--- a/install/turris-omnia.mk
+++ b/install/turris-omnia.mk
@ -0,0 +1,3 @@
+install-turris-omnia-uci-defaults:
+	mkdir -p files/etc/uci-defaults
+	cp misc/turris/omnia/uci-defaults/* files/etc/uci-defaults/
--- a/misc/turris/omnia/uci-defaults/99-resize-disk.sh
+++ b/misc/turris/omnia/uci-defaults/99-resize-disk.sh
@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -eo pipefail
+
+FLAG_FILE=/root/.disk_resized
+
+if [ -f "$FLAG_FILE" ]; then
+    exit
+fi
+
+DISK=/dev/mmcblk0
+PARTITION="${DISK}p2"
+
+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")"
+
+e2fsck -y -f "$LOOP_DEVICE"
+resize2fs "$LOOP_DEVICE"
+
+touch "$FLAG_FILE"
+
+reboot
--- a/targets/turris.mk
+++ b/targets/turris.mk
@ -4,7 +4,8 @@ turris: omnia

 omnia:
 	$(MAKE) \
-		ADDITIONAL_INSTALL="" \
+		ADDITIONAL_INSTALL="install-turris-omnia-uci-defaults" \
+		ADDITIONAL_OPENWRT_PACKAGES="losetup squashfs-tools-unsquashfs resize2fs e2fsprogs parted" \
 		OPENWRT_TARGET="mvebu/cortexa9" \
 		EMISSARY_ARCH="armv7" \
 		OPENWRT_PROFILE="cznic_turris-omnia" \
Author	SHA1	Message	Date
William Petit	40d6d2df03	fix(turris,omnia): reboot after disk resize All checks were successful arcad/emissary-firmware/pipeline/head This commit looks good Details	2023-04-14 17:37:19 +02:00
Jenkins	f70763aed7	feat: use emissary v2023.4.14-813f837 All checks were successful arcad/emissary-firmware/pipeline/head This commit looks good Details	2023-04-14 14:32:47 +00:00
Jenkins	475a807302	feat: use emissary v2023.4.13-ed35ee5 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-13 11:52:10 +00:00
Jenkins	4e075cbd8e	feat: use emissary v2023.4.13-4b5bc0b Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-13 10:11:55 +00:00
Jenkins	ed52367837	feat: use emissary v2023.4.13-dee6218 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-13 09:39:49 +00:00
Jenkins	a6c32c5315	feat: use emissary v2023.4.13-76656e8 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-13 09:32:01 +00:00
Jenkins	a35c5563db	feat: use emissary v2023.4.13-41b1619 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-13 09:08:54 +00:00
Jenkins	751f5398e1	feat: use emissary v2023.4.12-35d5ee8 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-12 09:13:52 +00:00
Jenkins	9b2c2e5cdc	feat: use emissary v2023.4.11-2315ee7 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-11 13:14:45 +00:00
Jenkins	2aa581e3c0	feat: use emissary v2023.4.11-86a6d81 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-11 10:09:57 +00:00
Jenkins	fc7be554a3	feat: use emissary v2023.4.11-8fb86c6 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-11 09:17:18 +00:00
William Petit	f6df7651da	feat(turris,omnia): automatically resize partition at startup Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-07 11:38:36 +02:00
Jenkins	87b15c940f	feat: use emissary v2023.4.6-12f8b3a All checks were successful arcad/emissary-firmware/pipeline/head This commit looks good Details	2023-04-06 19:00:29 +00:00
Jenkins	30d48ce4aa	feat: use emissary v2023.4.6-4cf53d9 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-06 17:28:39 +00:00
Jenkins	2f06b5fdcf	feat: use emissary v2023.4.6-47c2546 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-06 16:29:28 +00:00
Jenkins	c3070d2922	feat: use emissary v2023.4.6-2117391 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-06 16:21:15 +00:00
Jenkins	38a0d35c7b	feat: use emissary v2023.4.6-b213b8d Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-06 14:01:51 +00:00
Jenkins	9a48ff1a65	feat: use emissary v2023.4.6-9dcddc5 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-06 13:17:58 +00:00
Jenkins	e1ed8f9bd1	feat: use emissary v2023.4.6-253c93d Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-06 09:04:09 +00:00
Jenkins	cec076241a	feat: use emissary v2023.4.6-d2f865c Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-06 08:47:39 +00:00