package/e2fsprogs: fix fsck when using systemd
PATCH 1/1 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.
--- package/e2fsprogs/e2fsprogs.mk | 9 --------- 1 file changed, 9 deletions(-)
package/e2fsprogs/e2fsprogs.mk +0 -9
@@ -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))
Signature · 1 line
2.7.4
PATCH 1/1 package/e2fsprogs: fix fsck when using systemd
Martin, All
On 2016-06-11 17:15 +0100, Martin Bark spake thusly:
Quoted 10 lines
Commit a93fc34 modified e2fsprogs to symlink
/usr/sbin/fsckto/sbin/fsckto keep systemd happy. However, later on commitc5bd8af6has forced/usr/sbinto be a symlink to /sbin when using systemd. This means fsck gets destroyed as a symlink to itself when using systemd or when settingBR2_ROOTFS_MERGED_USR.Since commit
c5bd8af6obsoletes commit a93fc34 revert the changes from commit a93fc34 to solve the issue.Signed-off-by Martin Bark <[email protected]>
Regards,
Yann E. MORIN.
Quoted 30 lines
--- package/e2fsprogs/e2fsprogs.mk | 9 --------- 1 file changed, 9 deletions(-)package/e2fsprogs/e2fsprogs.mk +0
-9@@ -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))Signature · 6 lines
2.7.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Thomas Petazzoni
AppliedPATCH 1/1 package/e2fsprogs: fix fsck when using systemd
In reply to Martin BarkHello,
Quoted 6 lines · Martin Bark
Commit a93fc34 modified e2fsprogs to symlink
/usr/sbin/fsckto/sbin/fsckto keep systemd happy. However, later on commitc5bd8af6has forced/usr/sbinto be a symlink to /sbin when using systemd. This means fsck gets destroyed as a symlink to itself when using systemd or when settingBR2_ROOTFS_MERGED_USR.
Quoted 7 lines
Since commit
c5bd8af6obsoletes commit a93fc34 revert the changes from commit a93fc34 to solve the issue.Signed-off-by Martin Bark <[email protected]>--- package/e2fsprogs/e2fsprogs.mk | 9 --------- 1 file changed, 9 deletions(-)
Applied to master, thanks. Thanks Yann for the review.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com