[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d1b4c380ef4d64e1515d7ac6654167959fe472b5

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d1b4c380ef4d64e1515d7ac6654167959fe472b5

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 5123 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, master has been updated
       via  d1b4c380ef4d64e1515d7ac6654167959fe472b5 (commit)
       via  7c9f5f9882af2203e0445e1d9044f4df0bc00265 (commit)
      from  fe2fd95a9ef320391a09b91304a97bc68bc0573b (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 d1b4c380ef4d64e1515d7ac6654167959fe472b5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Sep 17 12:14:56 2023 +0000

    core179: add extrahd changes
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 7c9f5f9882af2203e0445e1d9044f4df0bc00265
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Sep 17 13:58:54 2023 +0200

    extrahd: use udev rule to mount extrahd partitions
    
    the previous patches for
    https://bugzilla.ipfire.org/show_bug.cgi?id=12863
    introduce a new bug that slow devices are not mounted
    at boot. So now udev calls the extrahd script with
    the uuid.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/extrahd/extrahd.pl                 | 36 ++++++++++++++++++++++++-------
 config/rootfiles/common/udev              |  1 +
 config/rootfiles/core/179/filelists/files |  1 +
 config/udev/61-extrahd.rules              |  1 +
 lfs/udev                                  |  4 ++++
 5 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 config/udev/61-extrahd.rules

Difference in files:
diff --git a/config/extrahd/extrahd.pl b/config/extrahd/extrahd.pl
index 145a2a43a..cc85228d5 100644
--- a/config/extrahd/extrahd.pl
+++ b/config/extrahd/extrahd.pl
@@ -35,10 +35,20 @@ extrahd_mount() {
 	local failed=0
 
 	while IFS=';' read -r device filesystem mountpoint rest; do
-		# Filter by mountpoint if set
-		if [ -n "${_mountpoint}" ] && [ "${mountpoint}" != "${_mountpoint}" ]; then
-			continue
-		fi
+		# Filter by UUID or mountpoint
+		case "${_mountpoint}" in
+			UUID=*)
+				if [ "${device}" != "${_mountpoint}" ]; then
+					continue
+				fi
+				;;
+
+			/*)
+				if [ -n "${_mountpoint}" ] && [ "${mountpoint}" != "${_mountpoint}" ]; then
+					continue
+				fi
+				;;
+		esac
 
 		# Check that the mountpoint starts with a slash
 		if [ "${mountpoint:0:1}" != "/" ]; then
@@ -75,10 +85,20 @@ extrahd_umount() {
 	local failed=0
 
 	while IFS=';' read -r device filesystem mountpoint rest; do
-		# Filter by mountpoint if set
-		if [ -n "${_mountpoint}" ] && [ "${mountpoint}" != "${_mountpoint}" ]; then
-			continue
-		fi
+		# Filter by UUID or mountpoint
+		case "${_mountpoint}" in
+			UUID=*)
+				if [ "${device}" != "${_mountpoint}" ]; then
+					continue
+				fi
+				;;
+
+			/*)
+				if [ -n "${_mountpoint}" ] && [ "${mountpoint}" != "${_mountpoint}" ]; then
+					continue
+				fi
+				;;
+		esac
 
 		# Do not try to umount if nothing is mounted
 		if ! mountpoint "${mountpoint}" &>/dev/null; then
diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev
index e5c9bd01f..876ae0c5a 100644
--- a/config/rootfiles/common/udev
+++ b/config/rootfiles/common/udev
@@ -70,6 +70,7 @@ lib/udev/rules.d/60-persistent-storage.rules
 lib/udev/rules.d/60-persistent-v4l.rules
 lib/udev/rules.d/60-sensor.rules
 lib/udev/rules.d/60-serial.rules
+lib/udev/rules.d/61-extrahd.rules
 lib/udev/rules.d/64-btrfs.rules
 lib/udev/rules.d/70-camera.rules
 lib/udev/rules.d/70-joystick.rules
diff --git a/config/rootfiles/core/179/filelists/files b/config/rootfiles/core/179/filelists/files
index 56a00e58f..46fa9c083 100644
--- a/config/rootfiles/core/179/filelists/files
+++ b/config/rootfiles/core/179/filelists/files
@@ -1,4 +1,5 @@
 etc/rc.d/init.d/networking/red
+lib/udev/rules.d/61-extrahd.rules
 srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
diff --git a/config/udev/61-extrahd.rules b/config/udev/61-extrahd.rules
new file mode 100644
index 000000000..114f2d665
--- /dev/null
+++ b/config/udev/61-extrahd.rules
@@ -0,0 +1 @@
+ACTION=="add", SUBSYSTEM=="block", RUN+="/var/ipfire/extrahd/bin/extrahd.pl udev-event"
diff --git a/lfs/udev b/lfs/udev
index eb01ae848..703d98b86 100644
--- a/lfs/udev
+++ b/lfs/udev
@@ -122,6 +122,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	install -v -m 644 $(DIR_SRC)/config/udev/60-net.rules \
 		/lib/udev/rules.d
 
+	# Install ExtraHD rules
+	install -v -m 644 $(DIR_SRC)/config/udev/61-extrahd.rules \
+		/lib/udev/rules.d
+
 	# Install AQM rules
 	install -v -m 644 $(DIR_SRC)/config/udev/99-aqm.rules \
 		/lib/udev/rules.d


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