[PATCH 2/2] flash-image: Create a journal when the filesystem is being created

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 1945 bytes --]

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)
 
 	# 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/partresize
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="on"
-				journal="on"
 			fi
 
 			mount /boot > /dev/null
@@ -110,18 +109,6 @@ case "${1}" in
 						root_dev="${dev::-2}"
 					fi
 
-					# Check if the device support smart
-					smartctl --smart=on "${root_dev}" > /dev/null
-					if [ ${?} = 0 ]; then
-						journal="on"
-					fi
-
-					# Enable journal
-					if [ "${journal}" = "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
 
-- 
2.39.5