diff options
| author | Martin Bark <martin@barkynet.com> | 2016-06-11 17:15:56 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-06-15 23:25:42 +0200 |
| commit | c1aa7a5b6007a80fad428d812b28d9cabc46e28a (patch) | |
| tree | 245fd4d2f1e996bad917441718446291952f944c /package/e2fsprogs | |
| parent | e7127d25c56b9af237366dac79e3b4a67b306fa4 (diff) | |
| download | buildroot-c1aa7a5b6007a80fad428d812b28d9cabc46e28a.tar.gz buildroot-c1aa7a5b6007a80fad428d812b28d9cabc46e28a.zip | |
package/e2fsprogs: fix fsck when using systemd
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@barkynet.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/e2fsprogs')
| -rw-r--r-- | package/e2fsprogs/e2fsprogs.mk | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 5ba9278fa9..7aa0285365 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)) |
