[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9f1636bf11968b431d9d484745346fa2b07fc5d7

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9f1636bf11968b431d9d484745346fa2b07fc5d7

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 4296 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  9f1636bf11968b431d9d484745346fa2b07fc5d7 (commit)
       via  d4a8484eb1805696b9147ef7cc873776d76f0c4e (commit)
       via  21d8c56c8a38d2622d13b0a60f14b6d41a5f355b (commit)
      from  9bfe4848bc48feddaa6b06fc29ff3501e8693ce4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f1636bf11968b431d9d484745346fa2b07fc5d7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 15 10:18:38 2023 +0000

    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(a)ipfire.org>

commit d4a8484eb1805696b9147ef7cc873776d76f0c4e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 15 09:48:35 2023 +0000

    mountfs: Remove excessive sync-ing before umount
    
    The system should perform all write operations when sync is called and
    only return when the write queues are empty.
    
    There is no additional benefit for calling sync again as the buffers
    should be empty. If data is still being lost, then that is a bug in
    either the storage device or driver.
    
    As the (re-)boot process is already so slow, I would like to get rid of
    any unnecessary delays.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 21d8c56c8a38d2622d13b0a60f14b6d41a5f355b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 15 09:47:25 2023 +0000

    mountfs: Mount ExtraHD filesystems
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/179/update.sh | 21 +++++++++++++++++++++
 src/initscripts/system/mountfs      | 14 +++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/179/update.sh b/config/rootfiles/core/179/update.sh
index bc8fa28cd..110335d13 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
diff --git a/src/initscripts/system/mountfs b/src/initscripts/system/mountfs
index 81ed729c1..8975eb02c 100644
--- a/src/initscripts/system/mountfs
+++ b/src/initscripts/system/mountfs
@@ -36,13 +36,21 @@ case "${1}" in
 		boot_mesg "Mounting remaining file systems..."
 		mount -a -O no_netdev &>/dev/null
 		evaluate_retval
+
+		# ExtraHD
+		boot_mesg "Mounting custom file systems..."
+		/var/ipfire/extrahd/bin/extrahd.pl mount
+		evaluate_retval
 		;;
 
 	stop)
 		boot_mesg "Syncing discs..."
-		sync && sync
-		sleep 2
-		sync && sync
+		sync
+		evaluate_retval
+
+		# ExtraHD
+		boot_mesg "Unmounting custom file systems..."
+		/var/ipfire/extrahd/bin/extrahd.pl umount
 		evaluate_retval
 
 		boot_mesg "Unmounting all other currently mounted file systems..."


hooks/post-receive
--
IPFire 2.x development tree