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 for Bug #12863
Date: Wed, 07 Jun 2023 13:25:50 +0100
Message-ID: <EBFF4C48-3A02-42FB-B6D3-A79968DEC172@ipfire.org>
In-Reply-To: <7CC7E099-EE53-4E18-BBB2-79607B005515@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7061709073650356992=="
List-Id: <development.lists.ipfire.org>

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

Hello Jon,

> On 5 Jun 2023, at 17:53, jon <jon.murphy(a)ipfire.org> wrote:
>=20
> Would flipping it around hurt less?
>=20
> (I=E2=80=99d don=E2=80=99t speak perl but I think this would work!)

Oh no this wasn=E2=80=99t targeted at the code, just at Perl in general. I do=
n=E2=80=99t find it obvious to read this at all, but there is no way to write=
 this in an absolute intuitive way.

So I am happy to have this merged as it is. The most important thing is that =
it does the right thing.

-Michael

> ```
> if ( &General::system("/usr/local/bin/extrahdctrl", "umount", "$extrahdsett=
ings{'PATH'}")) {
> $errormessage =3D "$Lang::tr{'extrahd cant umount'} $extrahdsettings{'PATH'=
}$Lang::tr{'extrahd maybe the device is in use'}?";
> } else {
> open( FILE, "< $devicefile" ) or die "Unable to read $devicefile";
> @tmp =3D <FILE>;
> close FILE;
> open( FILE, "> $devicefile" ) or die "Unable to write $devicefile";
> foreach $deviceentry (sort @tmp)
> {
> @tmpline =3D split( /\;/, $deviceentry );
> if ( $tmpline[2] ne $extrahdsettings{'PATH'} )
> {
> print FILE $deviceentry;
> }
> }
> close FILE;
> }
> ```
>=20
> Jon Murphy
> jon.murphy(a)ipfire.org
>=20
>=20
>=20
>> On Jun 5, 2023, at 5:42 AM, Michael Tremer <michael.tremer(a)ipfire.org> w=
rote:
>>=20
>> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
>>=20
>> The syntax pains me, but this is probably correct :)
>>=20
>>> On 2 Jun 2023, at 20:01, Jon Murphy <jon.murphy(a)ipfire.org> wrote:
>>>=20
>>> -Fixes remove entries in 'extrahd' via the webinterface for extrahd.cgi f=
ile.
>>>=20
>>> Suggested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
>>> Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
>>> ---
>>> html/cgi-bin/extrahd.cgi | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>=20
>>> diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
>>> index 36c0efc2e..9dd3a0eee 100644
>>> --- a/html/cgi-bin/extrahd.cgi
>>> +++ b/html/cgi-bin/extrahd.cgi
>>> @@ -103,7 +103,7 @@ END
>>> }
>>> elsif ($extrahdsettings{'ACTION'} eq $Lang::tr{'delete'})
>>> {
>>> - if ( &General::system("/usr/local/bin/extrahdctrl", "umount", "$extrahd=
settings{'PATH'}")) {
>>> + if ( ! &General::system("/usr/local/bin/extrahdctrl", "umount", "$extra=
hdsettings{'PATH'}")) {
>>> open( FILE, "< $devicefile" ) or die "Unable to read $devicefile";
>>> @tmp =3D <FILE>;
>>> close FILE;
>>> --=20
>>> 2.30.2
>>>=20
>>=20
>=20


--===============7061709073650356992==--