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

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

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2276 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  fe2fd95a9ef320391a09b91304a97bc68bc0573b (commit)
      from  b0fcbe414fc561187aedfd618149b73ac3c80ef8 (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 fe2fd95a9ef320391a09b91304a97bc68bc0573b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Sep 12 20:20:00 2023 +0200

    extrahd.cgi: Fix broken UUID check
    
    This check was totaly broken and resulted into not beeing able to
    configure/mount more than one extra harddrive.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 html/cgi-bin/extrahd.cgi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
index 9cdfc69f8..c3a14c9e4 100644
--- a/html/cgi-bin/extrahd.cgi
+++ b/html/cgi-bin/extrahd.cgi
@@ -113,13 +113,16 @@ if ($extrahdsettings{'ACTION'} eq $Lang::tr{'add'}) {
 			# Split the line into pieces and assign nice variables.
 			my ($uuid, $fs, $path) = split( /\;/, $entry );
 
+			# Remove tailing UUID= from uuid string.
+			$uuid =~ s{^UUID=}{};
+
 			# Check if the path is allready used.
 			if ( "$extrahdsettings{'PATH'}" eq "$path" ) {
 				$errormessage = "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'} $Lang::tr{'extrahd because there is already a device mounted'}.";
 			}
 
 			# Check if the uuid is allready used.
-			if ("$extrahdsettings{'DEVICE'} eq $uuid") {
+			if ("$extrahdsettings{'UUID'}" eq "$uuid") {
 				$errormessage = "$extrahdsettings{'DEVICE'} is allready mounted.";
 			}
 		}


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