From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] extrahd.cgi: Fix broken UUID check Date: Tue, 12 Sep 2023 20:20:00 +0200 Message-ID: <20230912182000.4937-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2054307119686198861==" List-Id: --===============2054307119686198861== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This check was totaly broken and resulted into not beeing able to configure/mount more than one extra harddrive. Signed-off-by: Stefan Schantl --- html/cgi-bin/extrahd.cgi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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) =3D split( /\;/, $entry ); =20 + # Remove tailing UUID=3D from uuid string. + $uuid =3D~ s{^UUID=3D}{}; + # Check if the path is allready used. if ( "$extrahdsettings{'PATH'}" eq "$path" ) { $errormessage =3D "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{= 'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'} $Lang::tr{'extrahd= because there is already a device mounted'}."; } =20 # Check if the uuid is allready used. - if ("$extrahdsettings{'DEVICE'} eq $uuid") { + if ("$extrahdsettings{'UUID'}" eq "$uuid") { $errormessage =3D "$extrahdsettings{'DEVICE'} is allready mounted."; } } --=20 2.39.2 --===============2054307119686198861==--