Page MenuHomeFreeBSD
Differential D7817

etcupdate: preserve the metadata of the destination file
ClosedPublic
Actions

Authored by vangyzen on Sep 7 2016, 6:00 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Nov 13, 8:24 PM
Unknown Object (File)
Thu, Nov 13, 9:18 AM
Unknown Object (File)
Sat, Nov 8, 2:39 PM
Unknown Object (File)
Wed, Nov 5, 1:05 PM
Unknown Object (File)
Thu, Oct 30, 8:00 PM
Unknown Object (File)
Sun, Oct 26, 7:28 AM
Unknown Object (File)
Sat, Oct 25, 4:55 AM
Unknown Object (File)
Fri, Oct 24, 10:25 AM
View All 90 Files
Subscribers
imp

Details

Reviewers
jhb
bapt
Commits
rS305620: etcupdate: preserve the metadata of the destination file
Summary

When using diff3 to perform a three-way merge, etcupdate lost the destination
file's metadata. The metadata from the temporary file were used instead.
This was unpleasant for rc.d scripts, which require execute permission.
Use "cat >" to overwrite the destination file's contents while preserving its
metadata.

Test Plan

All kyua tests still pass, although they don't test this case.

Diff Detail

Event Timeline

vangyzen updated this revision to Diff 20151.Sep 7 2016, 6:00 PM
vangyzen retitled this revision from to etcupdate: preserve the metadata of the destination file.
vangyzen updated this object.
vangyzen edited the test plan for this revision. (Show Details)
vangyzen added reviewers: jhb, bapt.
Herald added a subscriber: imp. · View Herald TranscriptSep 7 2016, 6:00 PM
bapt accepted this revision.Sep 8 2016, 3:49 PM
bapt edited edge metadata.
This revision is now accepted and ready to land.Sep 8 2016, 3:49 PM
Closed by commit rS305620: etcupdate: preserve the metadata of the destination file (authored by vangyzen). · Explain WhySep 8 2016, 3:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
usr.sbin/
etcupdate/
4 lines

Diff 20151

View Options

usr.sbin/etcupdate/etcupdate.sh

Loading...