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] installer: Pass choosen filesystem to hw_make_destination
Date: Mon, 25 Mar 2024 10:28:07 +0000
Message-ID: <851DDB4C-51C3-4CFB-9D9D-D1572374D2F1@ipfire.org>
In-Reply-To: <20240324123735.633148-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3571847878268417704=="
List-Id: <development.lists.ipfire.org>

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

Thank you.

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

> On 24 Mar 2024, at 12:37, Stefan Schantl <stefan.schantl(a)ipfire.org> wrot=
e:
>=20
> This is required to proper choose if a seperate boot partition should be
> created or must not created (BTRFS)
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> src/installer/hw.c   |  9 ++++---
> src/installer/hw.h   |  2 +-
> src/installer/main.c | 58 +++++++++++++++++++++++---------------------
> 3 files changed, 36 insertions(+), 33 deletions(-)
>=20
> diff --git a/src/installer/hw.c b/src/installer/hw.c
> index 77789e35e..46330ce43 100644
> --- a/src/installer/hw.c
> +++ b/src/installer/hw.c
> @@ -631,9 +631,13 @@ static int hw_calculate_partition_table(struct hw* hw,=
 struct hw_destination* de
> return 0;
> }
>=20
> -struct hw_destination* hw_make_destination(struct hw* hw, int part_type, s=
truct hw_disk** disks, int disable_swap) {
> +struct hw_destination* hw_make_destination(struct hw* hw, int part_type, s=
truct hw_disk** disks,
> + int disable_swap, int filesystem) {
> struct hw_destination* dest =3D malloc(sizeof(*dest));
>=20
> + // Assign filesystem
> + dest->filesystem =3D filesystem;
> +
> if (part_type =3D=3D HW_PART_TYPE_NORMAL) {
> dest->disk1 =3D *disks;
> dest->disk2 =3D NULL;
> @@ -655,9 +659,6 @@ struct hw_destination* hw_make_destination(struct hw* h=
w, int part_type, struct
> if (r)
> return NULL;
>=20
> - // Set default filesystem
> - dest->filesystem =3D HW_FS_DEFAULT;
> -
> return dest;
> }
>=20
> diff --git a/src/installer/hw.h b/src/installer/hw.h
> index 7fbea86de..bba06da95 100644
> --- a/src/installer/hw.h
> +++ b/src/installer/hw.h
> @@ -141,7 +141,7 @@ struct hw_disk** hw_select_disks(struct hw_disk** disks=
, int* selection);
> struct hw_disk** hw_select_first_disk(const struct hw_disk** disks);
>=20
> struct hw_destination* hw_make_destination(struct hw* hw, int part_type, st=
ruct hw_disk** disks,
> - int disable_swap);
> + int disable_swap, int filesystem);
>=20
> unsigned long long hw_memory();
>=20
> diff --git a/src/installer/main.c b/src/installer/main.c
> index 30f02d8cb..c31c032c2 100644
> --- a/src/installer/main.c
> +++ b/src/installer/main.c
> @@ -685,34 +685,9 @@ int main(int argc, char *argv[]) {
>=20
> hw_free_disks(disks);
>=20
> - struct hw_destination* destination =3D hw_make_destination(hw, part_type,
> - selected_disks, config.disable_swap);
> -
> - if (!destination) {
> - errorbox(_("Your harddisk is too small."));
> - goto EXIT;
> - }
> -
> - fprintf(flog, "Destination drive: %s\n", destination->path);
> - fprintf(flog, "  bootldr: %s (%lluMB)\n", destination->part_bootldr, BYTE=
S2MB(destination->size_bootldr));
> - fprintf(flog, "  boot   : %s (%lluMB)\n", destination->part_boot, BYTES2M=
B(destination->size_boot));
> - fprintf(flog, "  ESP    : %s (%lluMB)\n", destination->part_boot_efi, BYT=
ES2MB(destination->size_boot_efi));
> - fprintf(flog, "  swap   : %s (%lluMB)\n", destination->part_swap, BYTES2M=
B(destination->size_swap));
> - fprintf(flog, "  root   : %s (%lluMB)\n", destination->part_root, BYTES2M=
B(destination->size_root));
> - fprintf(flog, "Memory   : %lluMB\n", BYTES2MB(hw_memory()));
> -
> - // Warn the user if there is not enough space to create a swap partition
> - if (!config.unattended) {
> - if (!config.disable_swap && !*destination->part_swap) {
> - rc =3D newtWinChoice(title, _("OK"), _("Cancel"),
> - _("Your harddisk is very small, but you can continue without a swap parti=
tion."));
> -
> - if (rc !=3D 1)
> - goto EXIT;
> - }
> - }
> -
> // Filesystem selection
> + int filesystem =3D HW_FS_DEFAULT;
> +
> if (!config.unattended) {
> struct filesystems {
> int fstype;
> @@ -741,7 +716,34 @@ int main(int argc, char *argv[]) {
> if (rc =3D=3D 2)
> goto EXIT;
>=20
> - destination->filesystem =3D filesystems[fs_choice].fstype;
> + filesystem =3D filesystems[fs_choice].fstype;
> + }
> +
> + struct hw_destination* destination =3D hw_make_destination(hw, part_type,
> + selected_disks, config.disable_swap, filesystem);
> +
> + if (!destination) {
> + errorbox(_("Your harddisk is too small."));
> + goto EXIT;
> + }
> +
> + fprintf(flog, "Destination drive: %s\n", destination->path);
> + fprintf(flog, "  bootldr: %s (%lluMB)\n", destination->part_bootldr, BYTE=
S2MB(destination->size_bootldr));
> + fprintf(flog, "  boot   : %s (%lluMB)\n", destination->part_boot, BYTES2M=
B(destination->size_boot));
> + fprintf(flog, "  ESP    : %s (%lluMB)\n", destination->part_boot_efi, BYT=
ES2MB(destination->size_boot_efi));
> + fprintf(flog, "  swap   : %s (%lluMB)\n", destination->part_swap, BYTES2M=
B(destination->size_swap));
> + fprintf(flog, "  root   : %s (%lluMB)\n", destination->part_root, BYTES2M=
B(destination->size_root));
> + fprintf(flog, "Memory   : %lluMB\n", BYTES2MB(hw_memory()));
> +
> + // Warn the user if there is not enough space to create a swap partition
> + if (!config.unattended) {
> + if (!config.disable_swap && !*destination->part_swap) {
> + rc =3D newtWinChoice(title, _("OK"), _("Cancel"),
> + _("Your harddisk is very small, but you can continue without a swap parti=
tion."));
> +
> + if (rc !=3D 1)
> + goto EXIT;
> + }
> }
>=20
> // Setting up RAID if needed.
> --=20
> 2.39.2
>=20


--===============3571847878268417704==--