From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/2] flash-image: Create a journal when the filesystem is
 being created
Date: Sat, 14 Dec 2024 13:58:16 +0100
Message-ID: <b8c5e116-4ed1-4722-a7dc-6dc596326aa5@ipfire.org>
In-Reply-To: <20241214120547.863221-2-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9206319981425119121=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 14/12/2024 13:05, Michael Tremer wrote:
> We recently started to have problems when a new installation was
> launched from the flash image that creating the journal corrupted the
> filesystem on the next mount operation.
>
> Since we would like all IPFire installations to have a journal, we
> create this now when we create the image and won't try to add it later.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   lfs/flash-images                  |  2 +-
>   src/initscripts/system/partresize | 13 -------------
>   2 files changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/lfs/flash-images b/lfs/flash-images
> index 30513f0bc..27d3a89d7 100644
> --- a/lfs/flash-images
> +++ b/lfs/flash-images
> @@ -126,7 +126,7 @@ endif
>   ifeq "$(EFI)" "1"
>   	mkfs.vfat $(PART_EFI)
>   endif
> -	mkfs.ext4 -O ^has_journal,extent -F $(PART_ROOT)
> +	mkfs.ext4 -F $(PART_ROOT)
>  =20
>   	# Most systems that use Flashimages has no RTC at boot
>   	# so the interval check should disables
> diff --git a/src/initscripts/system/partresize b/src/initscripts/system/par=
tresize
> index df9c43991..832bc7237 100644
> --- a/src/initscripts/system/partresize
> +++ b/src/initscripts/system/partresize
> @@ -48,7 +48,6 @@ case "${1}" in
>   			# Azure and Google Compute Platform
>   			if running_on_ec2 || running_on_oci || running_on_azure || running_on_=
gcp; then
>   				scon=3D"on"
> -				journal=3D"on"
>   			fi
>  =20
>   			mount /boot > /dev/null
> @@ -110,18 +109,6 @@ case "${1}" in
>   						root_dev=3D"${dev::-2}"
>   					fi
>  =20
> -					# Check if the device support smart
> -					smartctl --smart=3Don "${root_dev}" > /dev/null
> -					if [ ${?} =3D 0 ]; then
> -						journal=3D"on"
> -					fi
> -
> -					# Enable journal
> -					if [ "${journal}" =3D "on" ]; then
> -						boot_mesg "Create journal on "${dev}" ..."
> -						tune2fs -O has_journal "${dev}"
> -					fi
> -
>   					boot_mesg "Growing root partition to maximum size..."
>   					echo -e ',+' | sfdisk --no-reread -f -N${part_num} "${root_dev}" 2>/=
dev/null
>  =20

--===============9206319981425119121==--