]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9bc7bbc) | patch
mergemaster: handle symbolic links during update.
authorWarner Losh <imp@FreeBSD.org>
Wed, 18 Nov 2020 19:22:24 +0000 (19:22 +0000)
committerWarner Losh <imp@FreeBSD.org>
Thu, 8 Jul 2021 05:10:05 +0000 (23:10 -0600)
commit427654eb6a1435acb15c272731fd9518b11961d7
tree84d657e85521f73397d6480ea2923d73829ffb57tree | snapshot
parent9bc7bbcf214b9e15b67e42706cef770ede541913commit | diff
mergemaster: handle symbolic links during update.

/etc/os-release is now a symbolic link to a generated file. Make
mergemaster cope with symbolic links generically. I'm no longer
a big mergemaster user, so this has only been lightly tested
by me, though Kimura-san has ran it through its paces.

Submitted by: Yasushiro KIMURA-san
PR: 242212
MFC After: 2 weeks

(cherry picked from commit 30a56f9ef72705f2f3646ce4330cbc20675a465e)
usr.sbin/mergemaster/mergemaster.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.