git: c702ed6eb8d4 - stable/13 - csh: install hard link with same mode as target
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 23 Mar 2023 15:10:30 UTC
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=c702ed6eb8d4a45221f57feaebe5a750e5ebf2ee
commit c702ed6eb8d4a45221f57feaebe5a750e5ebf2ee
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-11-23 17:14:18 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-03-23 14:33:01 +0000
csh: install hard link with same mode as target
Previously when using NO_ROOT we recorded METALOG entries for the /.cshrc
hard link with a different file mode than the link target, which is not
permitted.
We cannot just set LINKMODE here as it would also apply to the hard link
for the tcsh binary.
Reviewed by: brooks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D37499
(cherry picked from commit 67d2aaf078e967bb626cf50c53d679aad71aeaf9)
---
bin/csh/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 9aabc047493a..ad1f2011f2cf 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -159,6 +159,9 @@ beforeinstallconfig:
rm -f ${DESTDIR}/.cshrc
afterinstallconfig:
- ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
+ # XXX Set link mode explicitly via -m. We cannot use LINKMODE for this
+ # link, as it would also apply to the tcsh link above.
+ ${INSTALL_LINK} ${TAG_ARGS} -m ${CONFMODE} ${DESTDIR}/root/.cshrc \
+ ${DESTDIR}/.cshrc
.include <bsd.prog.mk>