From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 12 Sep 2023 18:20:00 +0000 (+0200)
Subject: extrahd.cgi: Fix broken UUID check
X-Git-Tag: v2.27-core180~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66cb52cb0dd18108881fa4a59cd343c2d9694094;p=ipfire-2.x.git

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@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
index 9cdfc69f82..c3a14c9e4b 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.";
 			}
 		}