From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCHv2 09/12] extrahd.cgi: Drop select for FS selection.
Date: Wed, 02 Aug 2023 14:09:28 +0200
Message-ID: <a0a44fa1-0003-eb84-cdaf-d07fb743b4fd@ipfire.org>
In-Reply-To: <20230801154839.2373-9-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6695125906260351820=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>


Am 01.08.2023 um 17:48 schrieb Stefan Schantl:
> 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 0b59a02f7..c621bd72f 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'$mou=
ntpoint' $disabled></td>
>   				<td align=3D"center">
>   					<input type=3D'hidden' name=3D'DEVICE' value=3D'/dev/$partition' />

--===============6695125906260351820==--