[Buildroot] [git commit] package/e2fsprogs: fix fsck when using systemd

Thomas Petazzoni thomas.petazzoni at free-electrons.com
Wed Jun 15 21:25:42 UTC 2016


commit: https://git.buildroot.net/buildroot/commit/?id=c1aa7a5b6007a80fad428d812b28d9cabc46e28a
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Commit a93fc34 modified e2fsprogs to symlink /usr/sbin/fsck to /sbin/fsck
to keep systemd happy.  However, later on commit c5bd8af6 has forced
/usr/sbin to be a symlink to /sbin when using systemd.  This means fsck
gets destroyed as a symlink to itself when using systemd or when setting
BR2_ROOTFS_MERGED_USR.

Since commit c5bd8af6 obsoletes commit a93fc34 revert the changes from
commit a93fc34 to solve the issue.

Signed-off-by: Martin Bark <martin at barkynet.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
 package/e2fsprogs/e2fsprogs.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 5ba9278..7aa0285 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -155,14 +155,5 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y)
 E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK
 endif
 
-# systemd really wants to have fsck in /sbin
-define E2FSPROGS_TARGET_FSCK_SYMLINK
-	ln -sf ../usr/sbin/fsck $(TARGET_DIR)/sbin/fsck
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_FSCK),y)
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FSCK_SYMLINK
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))


More information about the buildroot mailing list