From 0cef8c4fc38bf7537d6a79f0921abbba1e9a1a61 Mon Sep 17 00:00:00 2001
From: Henning Heinold <henning@itconsulting-heinold.de>
Date: Tue, 26 Aug 2014 16:34:55 +0200
Subject: [PATCH] initramfs: install and run e2fsck -f before resize2fs

Fixes: SYS#522
---
 recipes-core/initrdscripts/files/init-install.sh               | 2 +-
 recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-core/initrdscripts/files/init-install.sh b/recipes-core/initrdscripts/files/init-install.sh
index 18275486dc..d33bf37fbe 100644
--- a/recipes-core/initrdscripts/files/init-install.sh
+++ b/recipes-core/initrdscripts/files/init-install.sh
@@ -172,11 +172,11 @@ umount /boot
 umount /tgt_root
 
 echo "Resizing partition"
+e2fsck -f $rootfs || true
 resize2fs $rootfs
 
 sync
 
-
 echo "Remove your installation media, and press ENTER"
 
 read enter
diff --git a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc
index 0fca764c27..9ce47b14f6 100644
--- a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc
+++ b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc
@@ -1,2 +1,4 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
+
+RDEPENDS_${PN} += "e2fsprogs-e2fsck"