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: Drop select for FS selection.
Date: Fri, 23 Jun 2023 17:31:57 +0100
Message-ID: <C1B5AC05-4560-4B85-84A9-E1EF37B2567B@ipfire.org>
In-Reply-To: <20230623044403.4851-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3971232016713499915=="
List-Id: <development.lists.ipfire.org>

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

I agree.

This would have been needed to manually load any FUSE drivers, but since now =
even NTFS is handled in the kernel, the kernel should be able to load any ext=
ra modules automatically.

-Michael

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 23 Jun 2023, at 05:44, Stefan Schantl <stefan.schantl(a)ipfire.org> wrot=
e:
>=20
> This feature does not have any benefit because the linux kernel
> knows best which filesystem a device/partition has.
>=20
> So there is no need for a user to specify this by-hand. This also
> prevents from choosing a wrong fs type and as a direct result in a
> not mountable device.
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> html/cgi-bin/extrahd.cgi | 35 +++++------------------------------
> 1 file changed, 5 insertions(+), 30 deletions(-)
>=20
> diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
> index 8f6a91a18..bb67b792d 100644
> --- a/html/cgi-bin/extrahd.cgi
> +++ b/html/cgi-bin/extrahd.cgi
> @@ -45,16 +45,6 @@ my @valid_mount_dirs =3D (
> "/mnt",
> );
>=20
> -# Array which contains the supported file systems.
> -my @supported_filesystems =3D (
> - "auto",
> - "ext3",
> - "ext4",
> - "xfs",
> - "vfat",
> - "ntfs-3g"
> -);
> -
> # Grab all available block devices.
> my @devices =3D &get_block_devices();
>=20
> @@ -252,6 +242,9 @@ END
> # Convert into human-readable format.
> my $size =3D &General::formatBytes($bsize);
>=20
> + # Try to omit the used filesystem.
> + my $fs =3D $filesystems{$partition};
> +
> # Get the mountpoint.
> my $mountpoint =3D $mountpoints{$partition};
>=20
> @@ -279,11 +272,9 @@ END
> } elsif (&is_swap($partition)) {
> $disabled =3D "disabled";
> $mountpoint =3D "swap";
> + $fs =3D "swap";
> }
>=20
> - # Omit the used filesystem.
> - my $fs =3D $filesystems{$partition};
> -
> print <<END
>=20
> <form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
> @@ -291,23 +282,7 @@ END
> <tr>
> <td align=3D"list">/dev/$partition</td>
> <td align=3D"center">$Lang::tr{'size'} $size</td>
> - <td align=3D"center"><select name=3D"FS" $disabled>
> -END
> -;
> - # Loop through the array of supported filesystems.
> - foreach my $filesystem (@supported_filesystems) {
> - my $selected;
> -
> - # Mark the used filesystem as selected.
> - if ($filesystem eq $fs) {
> - $selected =3D "selected";
> - }
> -
> - print "<option value=3D'$filesystem' $selected>$filesystem</option>\n";
> - }
> -
> - print <<END
> - </select></td>
> + <td align=3D"center">$fs</td>
> <td align=3D"center"><input type=3D'text' name=3D'PATH' value=3D'$mountpoin=
t' $disabled></td>
> <td align=3D"center">
> <input type=3D'hidden' name=3D'DEVICE' value=3D'/dev/$partition' />
> --=20
> 2.39.2
>=20


--===============3971232016713499915==--