From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] extrahd.cgi: Fix broken UUID check
Date: Wed, 13 Sep 2023 15:22:30 +0100
Message-ID: <10D55417-1047-47FF-8C99-129F6764260B@ipfire.org>
In-Reply-To: <20230912182000.4937-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0987468141283212683=="
List-Id: <development.lists.ipfire.org>

--===============0987468141283212683==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Thank you for working on this so urgently.

> On 12 Sep 2023, at 19:20, Stefan Schantl <stefan.schantl(a)ipfire.org> wrot=
e:
>=20
> This check was totaly broken and resulted into not beeing able to
> configure/mount more than one extra harddrive.
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> html/cgi-bin/extrahd.cgi | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>=20
> 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{'DE=
VICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'} $Lang::tr{'extrahd be=
cause 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
>=20


--===============0987468141283212683==--