From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 15 Aug 2023 10:18:38 +0000 (+0000)
Subject: core179: Migrate old ExtraHD entries in /etc/fstab
X-Git-Tag: v2.27-core179~9^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f1636bf11968b431d9d484745346fa2b07fc5d7;p=ipfire-2.x.git

core179: Migrate old ExtraHD entries in /etc/fstab

The rewritten version of ExtraHD no longer stores entries in /etc/fstab
which is why they have to be removed during the update.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/179/update.sh b/config/rootfiles/core/179/update.sh
index bc8fa28cd5..110335d138 100644
--- a/config/rootfiles/core/179/update.sh
+++ b/config/rootfiles/core/179/update.sh
@@ -24,6 +24,24 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
+migrate_extrahd() {
+	local dev
+	local fs
+	local mp
+	local rest
+
+	while IFS=';' read -r dev fs mp rest; do
+		# Make sure mountpoint it set (so that we won't delete
+		# everything in /etc/fstab if there was an empty line).
+		if [ -z "${mp}" ]; then
+			continue
+		fi
+
+		# Remove the mountpoint from /etc/fstab
+		sed "/[[:blank:]]${mp//\//\\\/}[[:blank:]]/d" -i /etc/fstab
+	done < /var/ipfire/extrahd/devices
+}
+
 core=179
 
 # Remove old core updates from pakfire cache to save space...
@@ -61,6 +79,9 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Migrate ExtraHD
+migrate_extrahd
+
 # Start services
 /etc/init.d/udev restart
 /etc/init.d/squid restart