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 bc8fa28cd55376aac9146ee024dde8a70acc40f4..110335d13838d72cbfb51338fc36cf3164c0b0a5 100644 (file)
--- 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